JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #22354 from abbradar/dbus-etc

Browse Source 
dbus: don't search for units in current-system
This commit is contained in:
Nikolay Amiantov 2017-02-06 14:04:01 +03:00 committed by GitHub
commit 23d47ac2e6
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/dbus/default.nix
View File

@ -9,8 +9,9 @@ let
version = "1.10.14"; version = "1.10.14";
sha256 = "10x0wvv2ly4lyyfd42k4xw0ar5qdbi9cksw3l5fcwf1y6mq8y8r3"; sha256 = "10x0wvv2ly4lyyfd42k4xw0ar5qdbi9cksw3l5fcwf1y6mq8y8r3";
self = stdenv.mkDerivation { self = stdenv.mkDerivation {
name = "dbus-${version}"; name = "dbus-${version}";
inherit version;
src = fetchurl { src = fetchurl {
url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"; 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-systemdsystemunitdir=$(out)/etc/systemd/system"
"--with-systemduserunitdir=$(out)/etc/systemd/user" "--with-systemduserunitdir=$(out)/etc/systemd/user"
"--enable-user-session" "--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 "--libexecdir=$(out)/libexec" # we don't need dbus-daemon-launch-helper
] ++ lib.optional (!x11Support) "--without-x"; ] ++ lib.optional (!x11Support) "--without-x";
@ -64,7 +63,7 @@ self = stdenv.mkDerivation {
doCheck = true; doCheck = true;
installFlags = "sysconfdir=$(out)/etc datadir=$(out)/share"; installFlags = [ "sysconfdir=$(out)/etc" ];
# it's executed from $lib by absolute path # it's executed from $lib by absolute path
postFixup = '' postFixup = ''