diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-02-20 00:36:38 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-20 00:36:38 +0000 |
| commit | 848226f81019cfb1e0638181b55fd14a58245a1b (patch) | |
| tree | a51e5a676cc5e2d74dea2b724fc60566df9dcacc /pkgs/development/libraries/java | |
| parent | 99594dd1f1044641fc2b3f75bd0a4ef876ca3175 (diff) | |
| parent | cb2bce709f4767db4b38e3920d0baa35336c4c57 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/libraries/java')
| -rw-r--r-- | pkgs/development/libraries/java/junixsocket/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/java/junixsocket/default.nix b/pkgs/development/libraries/java/junixsocket/default.nix index 7a7d6a933bc06..0484f4c59ba6f 100644 --- a/pkgs/development/libraries/java/junixsocket/default.nix +++ b/pkgs/development/libraries/java/junixsocket/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ANT_ARGS = # Note that our OpenJDK on Darwin is currently 32-bit, so we have to build a 32-bit dylib. (if stdenv.is64bit then [ "-Dskip32=true" ] else [ "-Dskip64=true" ]) - ++ [ "-Dgcc=cc" "-Dant.build.javac.source=1.6" ] + ++ [ "-Dgcc=${stdenv.cc.targetPrefix}cc" "-Dant.build.javac.source=1.6" ] ++ lib.optional stdenv.isDarwin "-DisMac=true"; installPhase = |