diff options
| author | Jack Leightcap <jack@leightcap.com> | 2023-06-07 01:37:59 -0400 |
|---|---|---|
| committer | Jack Leightcap <jack@leightcap.com> | 2023-06-07 01:42:02 -0400 |
| commit | 4c2970da7e33e33488bf347aba306585e4c1f2cc (patch) | |
| tree | 6d492363ae20efd15a7fb4817d38d8817b2de36a /pkgs/build-support/cc-wrapper | |
| parent | a2271ff3d305af6dee1ae3aa481276b3debb8853 (diff) | |
gcj: fix compiler
Signed-off-by: Jack Leightcap <jack@leightcap.com>
Diffstat (limited to 'pkgs/build-support/cc-wrapper')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index bbcbaa58437bb..7b3088157661e 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -301,7 +301,7 @@ stdenv.mkDerivation { ''; strictDeps = true; - propagatedBuildInputs = [ bintools ] ++ extraTools ++ optionals cc.langD or false [ zlib ]; + propagatedBuildInputs = [ bintools ] ++ extraTools ++ optionals cc.langD or cc.langJava or false [ zlib ]; depsTargetTargetPropagated = optional (libcxx != null) libcxx ++ extraPackages; setupHooks = [ @@ -464,7 +464,7 @@ stdenv.mkDerivation { + optionalString propagateDoc '' ln -s ${cc.man} $man ln -s ${cc.info} $info - '' + optionalString (cc.langD or false) '' + '' + optionalString (cc.langD or cc.langJava or false) '' echo "-B${zlib}${zlib.libdir or "/lib/"}" >> $out/nix-support/libc-cflags '' |