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

Merge #12779: Mass replace pkg}/bin-style strings

Browse Source 
... to refer to correct outputs
This commit is contained in:
Vladimír Čunát
2016-02-03 17:25:22 +01:00
parent 824c8dfa95 e97e690244
commit 54299b60c4
30 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/glib/default.nix
View File

@@ -105,7 +105,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