From 103b7838bb0980a344eced0c00834a57783dfe42 Mon Sep 17 00:00:00 2001 From: Asko Soukka Date: Tue, 29 Sep 2015 04:49:47 +0300 Subject: [PATCH] darwin: libdevil: add needed inputs --- pkgs/development/libraries/libdevil/default.nix | 8 ++++++-- 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 3d3b6f157407..3e31e01e4909 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6896,7 +6896,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;