Unverified Commit 883ea1e0 authored by Domen Kožar's avatar Domen Kožar Committed by GitHub
Browse files

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

halide: remove mesa dependency on darwin
parents 7d432c1f d474fb31

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -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";

pkgs/development/compilers/halide/default.nix

+7 −2
Original line number Diff line number Diff line
@@ -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 ];

  };

}