diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2017-02-01 23:22:19 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2017-02-02 00:58:45 +0300 |
| commit | 4877a5664e356968ec3ca0c17d33a85992f4a348 (patch) | |
| tree | 94b1d6d39cb07c8a4b203955fb7b5bd8939e6357 /pkgs/development/libraries/dbus | |
| parent | a2e7770b51bfd611be9c9731248d87bdf1285cb2 (diff) | |
| download | nixpkgs-4877a5664e356968ec3ca0c17d33a85992f4a348.tar nixpkgs-4877a5664e356968ec3ca0c17d33a85992f4a348.tar.gz nixpkgs-4877a5664e356968ec3ca0c17d33a85992f4a348.tar.bz2 nixpkgs-4877a5664e356968ec3ca0c17d33a85992f4a348.tar.lz nixpkgs-4877a5664e356968ec3ca0c17d33a85992f4a348.tar.xz nixpkgs-4877a5664e356968ec3ca0c17d33a85992f4a348.tar.zst nixpkgs-4877a5664e356968ec3ca0c17d33a85992f4a348.zip | |
dbus: don't search for units in current-system
Diffstat (limited to 'pkgs/development/libraries/dbus')
| -rw-r--r-- | pkgs/development/libraries/dbus/default.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 509e7dd00c8..7743c1e3f80 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -9,8 +9,9 @@ let version = "1.10.14"; sha256 = "10x0wvv2ly4lyyfd42k4xw0ar5qdbi9cksw3l5fcwf1y6mq8y8r3"; -self = stdenv.mkDerivation { +self = stdenv.mkDerivation { name = "dbus-${version}"; + inherit version; src = fetchurl { url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"; @@ -49,8 +50,6 @@ self = stdenv.mkDerivation { "--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--with-systemduserunitdir=$(out)/etc/systemd/user" "--enable-user-session" - # this package installs nothing into those dirs and they create a dependency - "--datadir=/run/current-system/sw/share" "--libexecdir=$(out)/libexec" # we don't need dbus-daemon-launch-helper ] ++ lib.optional (!x11Support) "--without-x"; @@ -64,7 +63,7 @@ self = stdenv.mkDerivation { doCheck = true; - installFlags = "sysconfdir=$(out)/etc datadir=$(out)/share"; + installFlags = [ "sysconfdir=$(out)/etc" ]; # it's executed from $lib by absolute path postFixup = '' |