Merge pull request #173305 from bcdarwin/unbreak-ants

ants: unbreak build with gcc stdenv
main
Robert Scott 2 years ago committed by GitHub
commit aec48af439
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      pkgs/top-level/all-packages.nix

@ -17986,6 +17986,7 @@ with pkgs;
}; };
itk4 = callPackage ../development/libraries/itk/4.x.nix { itk4 = callPackage ../development/libraries/itk/4.x.nix {
stdenv = if stdenv.cc.isGNU && stdenv.system == "x86_64-linux" then gcc10Stdenv else stdenv;
inherit (darwin.apple_sdk.frameworks) Cocoa; inherit (darwin.apple_sdk.frameworks) Cocoa;
}; };
@ -32663,6 +32664,7 @@ with pkgs;
angsd = callPackage ../applications/science/biology/angsd { }; angsd = callPackage ../applications/science/biology/angsd { };
ants = callPackage ../applications/science/biology/ants { ants = callPackage ../applications/science/biology/ants {
stdenv = if stdenv.cc.isGNU && stdenv.system == "x86_64-linux" then gcc10Stdenv else stdenv;
inherit (darwin.apple_sdk.frameworks) Cocoa; inherit (darwin.apple_sdk.frameworks) Cocoa;
}; };

Loading…
Cancel
Save