diff options
| author | Shea Levy <shea@shealevy.com> | 2015-02-02 21:14:28 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2015-02-02 21:14:28 -0500 |
| commit | c45372f038bc89c69390bdbc6a4b0bfdb63b1423 (patch) | |
| tree | dc8ebe44d7a1ad0dc01b938199db38ebc14fbdfb /pkgs/development/compilers/openjdk | |
| parent | acbf8eb5617bb601e81cdc783f941773032cf400 (diff) | |
| parent | cfb29ab882323d379aba20a95020c7c24f883eae (diff) | |
| download | nixlib-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.tar nixlib-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.tar.gz nixlib-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.tar.bz2 nixlib-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.tar.lz nixlib-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.tar.xz nixlib-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.tar.zst nixlib-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.zip | |
Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
Partial staging merge, including cc-wrapper fixes Conflicts: pkgs/applications/audio/spotify/default.nix pkgs/build-support/cc-wrapper/default.nix pkgs/development/compilers/cryptol/1.8.x.nix
Diffstat (limited to 'pkgs/development/compilers/openjdk')
| -rw-r--r-- | pkgs/development/compilers/openjdk/bootstrap.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/development/compilers/openjdk/bootstrap.nix b/pkgs/development/compilers/openjdk/bootstrap.nix index 222ab010c264..890064538cc0 100644 --- a/pkgs/development/compilers/openjdk/bootstrap.nix +++ b/pkgs/development/compilers/openjdk/bootstrap.nix @@ -16,9 +16,13 @@ let in runCommand "openjdk-bootstrap" {} '' - xz -dc ${src} | sed "s/e*-glibc-[^/]*/$(basename ${glibc})/g" | tar xv + tar xvf ${src} mv openjdk-bootstrap $out + for i in $out/bin/*; do + patchelf --set-interpreter ${glibc}/lib/ld-linux*.so.2 $i + done + # Temporarily, while NixOS's OpenJDK bootstrap tarball doesn't have PaX markings: exes=$(${file}/bin/file $out/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//') for file in $exes; do |