diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-10-27 12:43:32 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-10-27 12:43:32 +0000 |
| commit | b90781ec21eae668b9afd9c6fc2a18e695cd04a9 (patch) | |
| tree | f9d18ff9273507cab53aee8a8e67459eda63f883 /pkgs/applications/editors | |
| parent | ee2b63c8723a204f323a104c3af0e391e023eb7e (diff) | |
| download | nixlib-b90781ec21eae668b9afd9c6fc2a18e695cd04a9.tar nixlib-b90781ec21eae668b9afd9c6fc2a18e695cd04a9.tar.gz nixlib-b90781ec21eae668b9afd9c6fc2a18e695cd04a9.tar.bz2 nixlib-b90781ec21eae668b9afd9c6fc2a18e695cd04a9.tar.lz nixlib-b90781ec21eae668b9afd9c6fc2a18e695cd04a9.tar.xz nixlib-b90781ec21eae668b9afd9c6fc2a18e695cd04a9.tar.zst nixlib-b90781ec21eae668b9afd9c6fc2a18e695cd04a9.zip | |
* Renamed orig-glibc -> orig-libc in some places, and in others, use
the new $NIX_GCC/nix-support/dynamic-linker file to locate the dynamic linker directly (don't hardcode ld-linux.so.2). svn path=/nixpkgs/trunk/; revision=6873
Diffstat (limited to 'pkgs/applications/editors')
| -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 |
4 files changed, 4 insertions, 5 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() { |