diff options
| -rwxr-xr-x | pkgs/applications/editors/eclipse/builder.sh | 3 | ||||
| -rw-r--r-- | pkgs/applications/editors/emacs-22-aa/builder.sh | 2 | ||||
| -rw-r--r-- | pkgs/applications/editors/emacs-22/builder.sh | 2 | ||||
| -rw-r--r-- | pkgs/applications/editors/emacs/builder.sh | 2 | ||||
| -rw-r--r-- | pkgs/applications/misc/acrobat-reader/builder.sh | 4 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/opera/builder.sh | 4 | ||||
| -rw-r--r-- | pkgs/applications/video/RealPlayer/builder.sh | 3 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/boot.sh | 3 | ||||
| -rw-r--r-- | pkgs/development/compilers/jdk/builder.sh | 3 | ||||
| -rw-r--r-- | pkgs/development/interpreters/perl/builder.sh | 2 | ||||
| -rw-r--r-- | pkgs/evil/belastingdienst/builder.sh | 3 | ||||
| -rw-r--r-- | pkgs/games/ut2004demo/builder.sh | 4 | ||||
| -rw-r--r-- | pkgs/games/ut2004demo/make-wrapper.sh | 2 |
13 files changed, 12 insertions, 25 deletions
diff --git a/pkgs/applications/editors/eclipse/builder.sh b/pkgs/applications/editors/eclipse/builder.sh index d781b585783e..8d693b025ffc 100755 --- a/pkgs/applications/editors/eclipse/builder.sh +++ b/pkgs/applications/editors/eclipse/builder.sh @@ -18,10 +18,9 @@ rpath= for i in $libraries; do rpath=$rpath${rpath:+:}$i/lib done -glibc=$(cat $NIX_GCC/nix-support/orig-glibc) find $out \( -type f -a -perm +0100 \) \ -print \ - -exec patchelf --interpreter $glibc/lib/ld-linux.so.* \ + -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ --set-rpath "$rpath" {} \; #find $out \( -type f -a -name "*.so*" \) \ # -print \ diff --git a/pkgs/applications/editors/emacs-22-aa/builder.sh b/pkgs/applications/editors/emacs-22-aa/builder.sh index a59f4d45f4a7..e9c909739d53 100644 --- a/pkgs/applications/editors/emacs-22-aa/builder.sh +++ b/pkgs/applications/editors/emacs-22-aa/builder.sh @@ -1,6 +1,6 @@ source $stdenv/setup -myglibc=`cat ${NIX_GCC}/nix-support/orig-glibc` +myglibc=`cat ${NIX_GCC}/nix-support/orig-libc` echo "glibc: $myglibc" postConfigure() { diff --git a/pkgs/applications/editors/emacs-22/builder.sh b/pkgs/applications/editors/emacs-22/builder.sh index a59f4d45f4a7..e9c909739d53 100644 --- a/pkgs/applications/editors/emacs-22/builder.sh +++ b/pkgs/applications/editors/emacs-22/builder.sh @@ -1,6 +1,6 @@ source $stdenv/setup -myglibc=`cat ${NIX_GCC}/nix-support/orig-glibc` +myglibc=`cat ${NIX_GCC}/nix-support/orig-libc` echo "glibc: $myglibc" postConfigure() { diff --git a/pkgs/applications/editors/emacs/builder.sh b/pkgs/applications/editors/emacs/builder.sh index a59f4d45f4a7..e9c909739d53 100644 --- a/pkgs/applications/editors/emacs/builder.sh +++ b/pkgs/applications/editors/emacs/builder.sh @@ -1,6 +1,6 @@ source $stdenv/setup -myglibc=`cat ${NIX_GCC}/nix-support/orig-glibc` +myglibc=`cat ${NIX_GCC}/nix-support/orig-libc` echo "glibc: $myglibc" postConfigure() { diff --git a/pkgs/applications/misc/acrobat-reader/builder.sh b/pkgs/applications/misc/acrobat-reader/builder.sh index 0add42a85959..d37919858f72 100644 --- a/pkgs/applications/misc/acrobat-reader/builder.sh +++ b/pkgs/applications/misc/acrobat-reader/builder.sh @@ -17,13 +17,11 @@ if test -n "$fastStart"; then rm -v $(ls $out/Reader/intellinux/plug_ins/*.api | grep -v SearchFind) fi -glibc=$(cat $NIX_GCC/nix-support/orig-glibc) - fullPath= for i in $libPath; do fullPath=$fullPath${fullPath:+:}$i/lib done -patchelf --interpreter $glibc/lib/ld-linux.so.* \ +patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ --set-rpath $fullPath \ $out/Reader/intellinux/bin/acroread diff --git a/pkgs/applications/networking/browsers/opera/builder.sh b/pkgs/applications/networking/browsers/opera/builder.sh index a0dadf07a9d9..59c0bf2cb606 100644 --- a/pkgs/applications/networking/browsers/opera/builder.sh +++ b/pkgs/applications/networking/browsers/opera/builder.sh @@ -11,8 +11,6 @@ installPhase() { # want to install icons in some system-wide directories. echo no | ./install.sh --prefix=$out - glibc=$(cat $NIX_GCC/nix-support/orig-glibc) - rpath=/no-such-path for i in $libPath; do rpath="$rpath:$i/lib" @@ -24,7 +22,7 @@ installPhase() { for i in $out/lib/opera/*/opera $out/lib/opera/plugins/opera*; do patchelf \ - --set-interpreter "$glibc/lib/ld-linux.so.2" \ + --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ --set-rpath "$rpath" \ "$i" done diff --git a/pkgs/applications/video/RealPlayer/builder.sh b/pkgs/applications/video/RealPlayer/builder.sh index 45892653b65b..298054916317 100644 --- a/pkgs/applications/video/RealPlayer/builder.sh +++ b/pkgs/applications/video/RealPlayer/builder.sh @@ -9,8 +9,7 @@ skip=143273 # Look for "BZh91" in the executable. rm -rf $out/real/Bin $out/real/postinst -glibc=$(cat $NIX_GCC/nix-support/orig-glibc) -patchelf --interpreter $glibc/lib/ld-linux.so.* $out/real/realplay.bin +patchelf --interpreter $(cat $NIX_GCC/nix-support/dynamic-linker) $out/real/realplay.bin ensureDir $out/bin makeWrapper "$out/real/realplay.bin" "$out/bin/realplay" \ diff --git a/pkgs/development/compilers/ghc/boot.sh b/pkgs/development/compilers/ghc/boot.sh index c4db43d735f8..e952f5d17ab7 100644 --- a/pkgs/development/compilers/ghc/boot.sh +++ b/pkgs/development/compilers/ghc/boot.sh @@ -2,9 +2,8 @@ source $stdenv/setup postBuild=postBuild postBuild () { - glibc=$(cat $NIX_GCC/nix-support/orig-glibc) find . -type f -perm +100 \ - -exec patchelf --interpreter $glibc/lib/ld-linux.so.* \ + -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ --set-rpath "$readline/lib:$ncurses/lib" {} \; } diff --git a/pkgs/development/compilers/jdk/builder.sh b/pkgs/development/compilers/jdk/builder.sh index fb26c26b2b7b..1b61d548c1bc 100644 --- a/pkgs/development/compilers/jdk/builder.sh +++ b/pkgs/development/compilers/jdk/builder.sh @@ -35,9 +35,8 @@ rpath= for i in $libraries; do rpath=$rpath${rpath:+:}$i/lib done -glibc=$(cat $NIX_GCC/nix-support/orig-glibc) find $out -type f -perm +100 \ - -exec patchelf --interpreter $glibc/lib/ld-linux.so.* \ + -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ --set-rpath "$rpath" {} \; # Unpack .pack files. diff --git a/pkgs/development/interpreters/perl/builder.sh b/pkgs/development/interpreters/perl/builder.sh index 172d683cf53c..fb03cd3c6796 100644 --- a/pkgs/development/interpreters/perl/builder.sh +++ b/pkgs/development/interpreters/perl/builder.sh @@ -1,6 +1,6 @@ source $stdenv/setup -if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE"; then +if test "$NIX_ENFORCE_PURITY" = "1"; then GLIBC=$(cat $NIX_GCC/nix-support/orig-libc) extraflags="-Dlocincpth=$GLIBC/include -Dloclibpth=$GLIBC/lib" fi diff --git a/pkgs/evil/belastingdienst/builder.sh b/pkgs/evil/belastingdienst/builder.sh index 3eb001f9e7f2..8e01f6b8b3e0 100644 --- a/pkgs/evil/belastingdienst/builder.sh +++ b/pkgs/evil/belastingdienst/builder.sh @@ -2,10 +2,9 @@ source $stdenv/setup buildPhase=buildPhase buildPhase() { - glibc=$(cat $NIX_GCC/nix-support/orig-glibc) for i in bin/*; do patchelf \ - --set-interpreter $glibc/lib/ld-linux.so.* \ + --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ --set-rpath $libX11/lib:$libXext/lib \ $i done diff --git a/pkgs/games/ut2004demo/builder.sh b/pkgs/games/ut2004demo/builder.sh index d4c45fa9d14f..52b043b53fda 100644 --- a/pkgs/games/ut2004demo/builder.sh +++ b/pkgs/games/ut2004demo/builder.sh @@ -24,8 +24,6 @@ mkdir $out # Set the ELF interpreter to our own Glibc. -glibc=$(cat $NIX_GCC/nix-support/orig-glibc) - for i in "$out/System/ucc-bin" "$out/System/ut2004-bin"; do - patchelf --set-interpreter "$glibc/lib/ld-linux.so.2" "$i" + patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" "$i" done diff --git a/pkgs/games/ut2004demo/make-wrapper.sh b/pkgs/games/ut2004demo/make-wrapper.sh index 06a809d4cbdc..d42adf1af069 100644 --- a/pkgs/games/ut2004demo/make-wrapper.sh +++ b/pkgs/games/ut2004demo/make-wrapper.sh @@ -2,8 +2,6 @@ source $stdenv/setup ensureDir $out/bin -glibc=$(cat $NIX_GCC/nix-support/orig-glibc) - cat > $out/bin/ut2004demo <<EOF #! $SHELL -e |