Merge pull request #238917 from twesterhout/halide-mesa-darwin
halide: remove mesa dependency on darwin
This commit is contained in:
commit
883ea1e0ba
@ -16689,6 +16689,12 @@
|
||||
githubId = 9413924;
|
||||
name = "Thorsten Weber";
|
||||
};
|
||||
twesterhout = {
|
||||
name = "Tom Westerhout";
|
||||
matrix = "@twesterhout:matrix.org";
|
||||
github = "twesterhout";
|
||||
githubId = 14264576;
|
||||
};
|
||||
twey = {
|
||||
email = "twey@twey.co.uk";
|
||||
github = "Twey";
|
||||
|
@ -3,9 +3,11 @@
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, libffi
|
||||
, libpng
|
||||
, libjpeg
|
||||
, mesa
|
||||
, libGL
|
||||
, eigen
|
||||
, openblas
|
||||
, blas
|
||||
@ -43,11 +45,14 @@ stdenv.mkDerivation rec {
|
||||
llvmPackages.lld
|
||||
llvmPackages.openmp
|
||||
llvmPackages.libclang
|
||||
libffi
|
||||
libpng
|
||||
libjpeg
|
||||
mesa
|
||||
eigen
|
||||
openblas
|
||||
] ++ lib.optionals (!stdenv.isDarwin) [
|
||||
mesa
|
||||
libGL
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
@ -57,6 +62,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://halide-lang.org";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ ck3d atila ];
|
||||
maintainers = with maintainers; [ ck3d atila twesterhout ];
|
||||
};
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user