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/games/ut2004demo | |
| parent | ee2b63c8723a204f323a104c3af0e391e023eb7e (diff) | |
| download | nixpkgs-b90781ec21eae668b9afd9c6fc2a18e695cd04a9.tar nixpkgs-b90781ec21eae668b9afd9c6fc2a18e695cd04a9.tar.gz nixpkgs-b90781ec21eae668b9afd9c6fc2a18e695cd04a9.tar.bz2 nixpkgs-b90781ec21eae668b9afd9c6fc2a18e695cd04a9.tar.lz nixpkgs-b90781ec21eae668b9afd9c6fc2a18e695cd04a9.tar.xz nixpkgs-b90781ec21eae668b9afd9c6fc2a18e695cd04a9.tar.zst nixpkgs-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/games/ut2004demo')
| -rw-r--r-- | pkgs/games/ut2004demo/builder.sh | 4 | ||||
| -rw-r--r-- | pkgs/games/ut2004demo/make-wrapper.sh | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/pkgs/games/ut2004demo/builder.sh b/pkgs/games/ut2004demo/builder.sh index d4c45fa9d14..52b043b53fd 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 06a809d4cbd..d42adf1af06 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 |