diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-08-12 10:09:41 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-08-12 10:09:41 +0200 |
| commit | 6899c7fdb989ce02f877ce5c0490a20ac4a64bf0 (patch) | |
| tree | 68a2e9b25d3b4f0d0a70343b38d10bdc0111f20d /pkgs/development/compilers/openjdk/8.nix | |
| parent | 9bcee1051a94d6ba2be64a19665f017542122b83 (diff) | |
| parent | e207d1f04ad262f53e387e9e3956a2a9c421a66a (diff) | |
| download | nixlib-6899c7fdb989ce02f877ce5c0490a20ac4a64bf0.tar nixlib-6899c7fdb989ce02f877ce5c0490a20ac4a64bf0.tar.gz nixlib-6899c7fdb989ce02f877ce5c0490a20ac4a64bf0.tar.bz2 nixlib-6899c7fdb989ce02f877ce5c0490a20ac4a64bf0.tar.lz nixlib-6899c7fdb989ce02f877ce5c0490a20ac4a64bf0.tar.xz nixlib-6899c7fdb989ce02f877ce5c0490a20ac4a64bf0.tar.zst nixlib-6899c7fdb989ce02f877ce5c0490a20ac4a64bf0.zip | |
Merge branch 'master' into gcc-6
Diffstat (limited to 'pkgs/development/compilers/openjdk/8.nix')
| -rw-r--r-- | pkgs/development/compilers/openjdk/8.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index e157249fb2f3..838c02ce7e82 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -97,6 +97,7 @@ let chmod +x configure substituteInPlace configure --replace /bin/bash "$shell" substituteInPlace hotspot/make/linux/adlc_updater --replace /bin/sh "$shell" + substituteInPlace hotspot/make/linux/makefiles/dtrace.make --replace /usr/include/sys/sdt.h "/no-such-path" ''; configureFlags = [ @@ -202,7 +203,7 @@ let # any package that depends on the JRE has $CLASSPATH set up # properly. mkdir -p $jre/nix-support - echo -n "${setJavaClassPath}" > $jre/nix-support/propagated-native-build-inputs + printWords ${setJavaClassPath} > $jre/nix-support/propagated-native-build-inputs # Set JAVA_HOME automatically. mkdir -p $out/nix-support |