diff options
| author | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2015-10-25 04:34:05 +0300 |
|---|---|---|
| committer | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2015-10-25 04:34:05 +0300 |
| commit | 480cd9478fe9dd003ae84077073ffbcb2ee3dfbd (patch) | |
| tree | bfb078231f4e904d9598b9155234abf3eeba8470 /pkgs | |
| parent | d55679c1b41474b14622fc7cd34d8dd61f345a05 (diff) | |
| parent | 103b7838bb0980a344eced0c00834a57783dfe42 (diff) | |
| download | nixlib-480cd9478fe9dd003ae84077073ffbcb2ee3dfbd.tar nixlib-480cd9478fe9dd003ae84077073ffbcb2ee3dfbd.tar.gz nixlib-480cd9478fe9dd003ae84077073ffbcb2ee3dfbd.tar.bz2 nixlib-480cd9478fe9dd003ae84077073ffbcb2ee3dfbd.tar.lz nixlib-480cd9478fe9dd003ae84077073ffbcb2ee3dfbd.tar.xz nixlib-480cd9478fe9dd003ae84077073ffbcb2ee3dfbd.tar.zst nixlib-480cd9478fe9dd003ae84077073ffbcb2ee3dfbd.zip | |
Merge pull request #10567 from datakurre/datakurre-libdevil
darwin: libdevil: add needed inputs
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/libdevil/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix index abc7dd3af40e..996301988859 100644 --- a/pkgs/development/libraries/libdevil/default.nix +++ b/pkgs/development/libraries/libdevil/default.nix @@ -1,5 +1,8 @@ { stdenv, fetchurl, libjpeg, libpng, libmng, lcms1, libtiff, openexr, mesa -, libX11, pkgconfig }: +, libX11, pkgconfig + +, OpenGL +}: stdenv.mkDerivation rec { @@ -11,7 +14,8 @@ stdenv.mkDerivation rec { sha256 = "1zd850nn7nvkkhasrv7kn17kzgslr5ry933v6db62s4lr0zzlbv8"; }; - buildInputs = [ libjpeg libpng libmng lcms1 libtiff openexr mesa libX11 ]; + buildInputs = [ libjpeg libpng libmng lcms1 libtiff openexr mesa libX11 ] + ++ stdenv.lib.optionals stdenv.isDarwin [ OpenGL ]; nativeBuildInputs = [ pkgconfig ]; configureFlags = [ "--enable-ILU" "--enable-ILUT" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b465ff43605..8a694ccca36e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6902,7 +6902,9 @@ let libdc1394avt = callPackage ../development/libraries/libdc1394avt { }; - libdevil = callPackage ../development/libraries/libdevil { }; + libdevil = callPackage ../development/libraries/libdevil { + inherit (darwin.apple_sdk.frameworks) OpenGL; + }; libdevil-nox = libdevil.override { libX11 = null; |