diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-02-01 20:45:59 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-02-01 20:45:59 +0200 |
| commit | a4dff4bf1bb9e66ad553e5b43b244b77060d98ae (patch) | |
| tree | 47b5f4a2ea1ece9d6d3ebd821eca50108743f177 /pkgs | |
| parent | 5f4a8de7541c5ce6e62a1e53a51d58f543dbdf70 (diff) | |
| download | nixlib-a4dff4bf1bb9e66ad553e5b43b244b77060d98ae.tar nixlib-a4dff4bf1bb9e66ad553e5b43b244b77060d98ae.tar.gz nixlib-a4dff4bf1bb9e66ad553e5b43b244b77060d98ae.tar.bz2 nixlib-a4dff4bf1bb9e66ad553e5b43b244b77060d98ae.tar.lz nixlib-a4dff4bf1bb9e66ad553e5b43b244b77060d98ae.tar.xz nixlib-a4dff4bf1bb9e66ad553e5b43b244b77060d98ae.tar.zst nixlib-a4dff4bf1bb9e66ad553e5b43b244b77060d98ae.zip | |
treewide: Mass replace 'dbus_daemon}/bin' to refer the 'out' output
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/misc/dunst/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/glib/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index c398c3c43d00..651c74b2d217 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram "$out/bin/dunst" \ - --prefix PATH : '${dbus_daemon}/bin' + --prefix PATH : '${dbus_daemon.out}/bin' ''; meta = { diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 7feccdef9aaa..894dee3990c5 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { export XDG_RUNTIME_HOME="$TMP" export HOME="$TMP" export XDG_DATA_DIRS="${desktop_file_utils}/share:${shared_mime_info}/share" - export G_TEST_DBUS_DAEMON="${dbus_daemon}/bin/dbus-daemon" + export G_TEST_DBUS_DAEMON="${dbus_daemon.out}/bin/dbus-daemon" substituteInPlace gio/tests/desktop-files/home/applications/epiphany-weather-for-toronto-island-9c6a4e022b17686306243dada811d550d25eb1fb.desktop --replace "Exec=/bin/true" "Exec=${coreutils}/bin/true" # Needs machine-id, comment the test |