3
0
Fork 0
forked from mirrors/nixpkgs

treewide: Mass replace 'dbus_daemon}/bin' to refer the 'out' output

This commit is contained in:
Tuomas Tynkkynen 2016-02-01 20:45:59 +02:00
parent 5f4a8de754
commit a4dff4bf1b
2 changed files with 2 additions and 2 deletions

View file

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
postFixup = ''
wrapProgram "$out/bin/dunst" \
--prefix PATH : '${dbus_daemon}/bin'
--prefix PATH : '${dbus_daemon.out}/bin'
'';
meta = {

View file

@ -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