diff options
author | OPNA2608 <christoph.neidahl@gmail.com> | 2022-03-22 18:59:05 +0100 |
---|---|---|
committer | OPNA2608 <christoph.neidahl@gmail.com> | 2022-03-23 21:37:39 +0100 |
commit | d2f268745a44dfd0ff23b5a00a75c1e13279bc3d (patch) | |
tree | 196dd1900cc1b4aa1a8ca4c822d9b07668c38ade /pkgs/development/compilers/zulu | |
parent | 48034046bf6271d44f7dea4c1ba97196b3b105a7 (diff) |
treewide: autoPatchelfHook only on Linux
Diffstat (limited to 'pkgs/development/compilers/zulu')
-rw-r--r-- | pkgs/development/compilers/zulu/8.nix | 12 | ||||
-rw-r--r-- | pkgs/development/compilers/zulu/default.nix | 8 |
2 files changed, 16 insertions, 4 deletions
diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix index 48573c6724159..00f18f1238fe7 100644 --- a/pkgs/development/compilers/zulu/8.nix +++ b/pkgs/development/compilers/zulu/8.nix @@ -61,18 +61,22 @@ in stdenv.mkDerivation { ]; nativeBuildInputs = [ - autoPatchelfHook makeWrapper + makeWrapper + ] ++ lib.optionals stdenv.isLinux [ + autoPatchelfHook ] ++ lib.optionals stdenv.isDarwin [ unzip ]; installPhase = '' + runHook preInstall + mkdir -p $out cp -r ./* "$out/" - + '' + lib.optionalString stdenv.isLinux '' # jni.h expects jni_md.h to be in the header search path. ln -s $out/include/linux/*_md.h $out/include/ - + '' + '' mkdir -p $out/nix-support printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs @@ -87,6 +91,8 @@ in stdenv.mkDerivation { wrapProgram "$bin" --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}" fi done + '' + '' + runHook postInstall ''; preFixup = '' diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix index 662d997d88288..1b961c3f9e406 100644 --- a/pkgs/development/compilers/zulu/default.nix +++ b/pkgs/development/compilers/zulu/default.nix @@ -63,12 +63,16 @@ in stdenv.mkDerivation { ]; nativeBuildInputs = [ - autoPatchelfHook makeWrapper + makeWrapper + ] ++ lib.optionals stdenv.isLinux [ + autoPatchelfHook ] ++ lib.optionals stdenv.isDarwin [ unzip ]; installPhase = '' + runHook preInstall + mkdir -p $out cp -r ./* "$out/" '' + lib.optionalString stdenv.isLinux '' @@ -90,6 +94,8 @@ in stdenv.mkDerivation { for bin in $( find "$out" -executable -type f -not -name jspawnhelper ); do wrapProgram "$bin" --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}" done + '' + '' + runHook postInstall ''; preFixup = '' |