Merge pull request #80046 from bcdarwin/c3d-downgrade-gcc

c3d: unbreak via stdenv -> gcc8Stdenv
This commit is contained in:
worldofpeace 2020-02-13 17:48:23 -05:00 committed by GitHub
commit 05f5786f0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 0 deletions

View File

@ -20,5 +20,7 @@ stdenv.mkDerivation {
maintainers = with maintainers; [ bcdarwin ]; maintainers = with maintainers; [ bcdarwin ];
platforms = platforms.unix; platforms = platforms.unix;
license = licenses.gpl2; license = licenses.gpl2;
broken = stdenv.isAarch64;
# /build/git-3453f61/itkextras/OneDimensionalInPlaceAccumulateFilter.txx:311:10: fatal error: xmmintrin.h: No such file or directory
}; };
} }

View File

@ -1322,6 +1322,7 @@ in
bs-platform = callPackage ../development/compilers/bs-platform {}; bs-platform = callPackage ../development/compilers/bs-platform {};
c3d = callPackage ../applications/graphics/c3d { c3d = callPackage ../applications/graphics/c3d {
stdenv = gcc8Stdenv;
inherit (darwin.apple_sdk.frameworks) Cocoa; inherit (darwin.apple_sdk.frameworks) Cocoa;
}; };