diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-01-24 09:29:16 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-01-24 10:03:35 +0200 |
| commit | a1909d73800a520b34640693343da7b68d5b7294 (patch) | |
| tree | fe12e921fa3b9939355ad2ae1ecf4b22ba3bb473 /pkgs/applications | |
| parent | b56b24f72909aaf156aae78390d8b4e5d21014ca (diff) | |
| download | nixlib-a1909d73800a520b34640693343da7b68d5b7294.tar nixlib-a1909d73800a520b34640693343da7b68d5b7294.tar.gz nixlib-a1909d73800a520b34640693343da7b68d5b7294.tar.bz2 nixlib-a1909d73800a520b34640693343da7b68d5b7294.tar.lz nixlib-a1909d73800a520b34640693343da7b68d5b7294.tar.xz nixlib-a1909d73800a520b34640693343da7b68d5b7294.tar.zst nixlib-a1909d73800a520b34640693343da7b68d5b7294.zip | |
treewide: Mass replace 'glibc}/lib' to refer the 'out' output
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/audio/baudline/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/editors/idea/common.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/misc/kiwix/default.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/audio/baudline/default.nix b/pkgs/applications/audio/baudline/default.nix index 543329ef679b..2d6b0434d6a1 100644 --- a/pkgs/applications/audio/baudline/default.nix +++ b/pkgs/applications/audio/baudline/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { cp -r . "$out/libexec/baudline/" - interpreter="$(echo ${stdenv.glibc}/lib/ld-linux*)" + interpreter="$(echo ${stdenv.glibc.out}/lib/ld-linux*)" for prog in "$out"/libexec/baudline/baudline*; do patchelf --interpreter "$interpreter" "$prog" ln -sr "$prog" "$out/bin/" diff --git a/pkgs/applications/editors/idea/common.nix b/pkgs/applications/editors/idea/common.nix index 96689fa75ad6..979a374701f8 100644 --- a/pkgs/applications/editors/idea/common.nix +++ b/pkgs/applications/editors/idea/common.nix @@ -37,7 +37,7 @@ with stdenv; lib.makeOverridable mkDerivation rec { truncate --size=$size $fname } - interpreter=$(echo ${stdenv.glibc}/lib/ld-linux*.so.2) + interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2) if [ "${stdenv.system}" == "x86_64-linux" ]; then target_size=$(get_file_size bin/fsnotifier64) patchelf --set-interpreter "$interpreter" bin/fsnotifier64 diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index 30db6a45ea1b..d29e4fca3b29 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { make install cp -r src/dependencies/xulrunner $out/lib/kiwix - patchelf --set-interpreter ${glibc}/lib/ld-linux${optionalString (stdenv.system == "x86_64-linux") "-x86-64"}.so.2 $out/lib/kiwix/xulrunner/xulrunner + patchelf --set-interpreter ${glibc.out}/lib/ld-linux${optionalString (stdenv.system == "x86_64-linux") "-x86-64"}.so.2 $out/lib/kiwix/xulrunner/xulrunner rm $out/bin/kiwix makeWrapper $out/lib/kiwix/kiwix-launcher $out/bin/kiwix \ |