dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #238917 from twesterhout/halide-mesa-darwin

Browse Source 
halide: remove mesa dependency on darwin
This commit is contained in:
Domen Kožar 2023-06-27 10:41:11 +01:00 committed by GitHub
commit 883ea1e0ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@ -16689,6 +16689,12 @@
githubId = 9413924; githubId = 9413924;
name = "Thorsten Weber"; name = "Thorsten Weber";
}; };
twesterhout = {
name = "Tom Westerhout";
matrix = "@twesterhout:matrix.org";
github = "twesterhout";
githubId = 14264576;
};
twey = { twey = {
email = "twey@twey.co.uk"; email = "twey@twey.co.uk";
github = "Twey"; github = "Twey";

9
pkgs/development/compilers/halide/default.nix
View File

@ -3,9 +3,11 @@
, lib , lib
, fetchFromGitHub , fetchFromGitHub
, cmake , cmake
, libffi
, libpng , libpng
, libjpeg , libjpeg
, mesa , mesa
, libGL
, eigen , eigen
, openblas , openblas
, blas , blas
@ -43,11 +45,14 @@ stdenv.mkDerivation rec {
llvmPackages.lld llvmPackages.lld
llvmPackages.openmp llvmPackages.openmp
llvmPackages.libclang llvmPackages.libclang
libffi
libpng libpng
libjpeg libjpeg
mesa
eigen eigen
openblas openblas
] ++ lib.optionals (!stdenv.isDarwin) [
mesa
libGL
]; ];
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
@ -57,6 +62,6 @@ stdenv.mkDerivation rec {
homepage = "https://halide-lang.org"; homepage = "https://halide-lang.org";
license = licenses.mit; license = licenses.mit;
platforms = platforms.all; platforms = platforms.all;
maintainers = with maintainers; [ ck3d atila ]; maintainers = with maintainers; [ ck3d atila twesterhout ];
}; };
} }