diff options
| author | Orivej Desh <orivej@gmx.fr> | 2017-11-12 16:44:44 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2017-11-12 16:44:44 +0000 |
| commit | 9b43c21ba52e9b029b75d636e36985227a469501 (patch) | |
| tree | 783fb2f7cd6cd95cd4e7ec7e43d1b18ac5800655 | |
| parent | hydra: 2017-09-14 -> 2017-10-26 (diff) | |
| parent | Merge pull request #31550 from orivej/dbus-1 (diff) | |
| download | nixpkgs-gitlab.intr/hydra.tar.gz | |
Merge branch 'master' into hydragitlab.intr/hydra
* master:
make-dbus-conf: prefer local build
| -rw-r--r-- | pkgs/development/libraries/dbus/make-dbus-conf.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/development/libraries/dbus/make-dbus-conf.nix b/pkgs/development/libraries/dbus/make-dbus-conf.nix index d836d87efef8..71da22ee3748 100644 --- a/pkgs/development/libraries/dbus/make-dbus-conf.nix +++ b/pkgs/development/libraries/dbus/make-dbus-conf.nix @@ -11,6 +11,7 @@ runCommand "dbus-1" { inherit serviceDirectories suidHelper; + preferLocalBuild = true; XML_CATALOG_FILES = writeText "dbus-catalog.xml" '' <?xml version="1.0"?> <!DOCTYPE catalog PUBLIC |