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/networking/browsers/opera | |
| 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/networking/browsers/opera')
| -rw-r--r-- | pkgs/applications/networking/browsers/opera/builder.sh | 4 |
1 files changed, 1 insertions, 3 deletions
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 |