mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 15:03:28 +00:00
gcj: fix compiler
Signed-off-by: Jack Leightcap <jack@leightcap.com>
This commit is contained in:
parent
a2271ff3d3
commit
4c2970da7e
@ -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
|
||||
''
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user