ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2025-01-05 20:11:43 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10567 from datakurre/datakurre-libdevil

Browse Source 
darwin: libdevil: add needed inputs
This commit is contained in:
Arseniy Seroka 2015-10-25 04:34:05 +03:00
commit 480cd9478f
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/libdevil/default.nix
View File

@ -1,5 +1,8 @@
{ stdenv, fetchurl, libjpeg, libpng, libmng, lcms1, libtiff, openexr, mesa { stdenv, fetchurl, libjpeg, libpng, libmng, lcms1, libtiff, openexr, mesa
, libX11, pkgconfig }: , libX11, pkgconfig
, OpenGL
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -11,7 +14,8 @@ stdenv.mkDerivation rec {
sha256 = "1zd850nn7nvkkhasrv7kn17kzgslr5ry933v6db62s4lr0zzlbv8"; 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 ]; nativeBuildInputs = [ pkgconfig ];
configureFlags = [ "--enable-ILU" "--enable-ILUT" ]; configureFlags = [ "--enable-ILU" "--enable-ILUT" ];

4
pkgs/top-level/all-packages.nix
View File

@ -6902,7 +6902,9 @@ let
libdc1394avt = callPackage ../development/libraries/libdc1394avt { }; 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 { libdevil-nox = libdevil.override {
libX11 = null; libX11 = null;