diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2016-11-05 20:17:42 +0100 |
---|---|---|
committer | Eelco Dolstra <edolstra@gmail.com> | 2016-11-16 20:56:35 +0100 |
commit | f66271238eeaa740f02615579d33eab96073fe0a (patch) | |
tree | 3e610044616080b186044fa2b9df22ab1e5c9279 /pkgs/development/libraries/libdevil | |
parent | f3dbb0892c7f3bc4e9605e428b4292a451de0501 (diff) | |
download | nixpkgs-f66271238eeaa740f02615579d33eab96073fe0a.tar nixpkgs-f66271238eeaa740f02615579d33eab96073fe0a.tar.gz nixpkgs-f66271238eeaa740f02615579d33eab96073fe0a.tar.bz2 nixpkgs-f66271238eeaa740f02615579d33eab96073fe0a.tar.lz nixpkgs-f66271238eeaa740f02615579d33eab96073fe0a.tar.xz nixpkgs-f66271238eeaa740f02615579d33eab96073fe0a.tar.zst nixpkgs-f66271238eeaa740f02615579d33eab96073fe0a.zip |
libdevil: Use multiple outputs
Diffstat (limited to 'pkgs/development/libraries/libdevil')
-rw-r--r-- | pkgs/development/libraries/libdevil/default.nix | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix index 3b63ba98f57..68bd72f3e0f 100644 --- a/pkgs/development/libraries/libdevil/default.nix +++ b/pkgs/development/libraries/libdevil/default.nix @@ -1,12 +1,10 @@ -{ stdenv, fetchurl, libjpeg, libpng, libmng, lcms1, libtiff, openexr, mesa -, libX11, pkgconfig - -, OpenGL +{ stdenv, fetchurl, libjpeg, libpng, libmng, lcms1, libtiff, openexr, mesa_noglu +, libX11, pkgconfig, OpenGL }: stdenv.mkDerivation rec { - name ="libdevil-${version}"; + name = "libdevil-${version}"; version = "1.7.8"; src = fetchurl { @@ -14,7 +12,9 @@ stdenv.mkDerivation rec { sha256 = "1zd850nn7nvkkhasrv7kn17kzgslr5ry933v6db62s4lr0zzlbv8"; }; - buildInputs = [ libjpeg libpng libmng lcms1 libtiff openexr mesa libX11 ] + outputs = [ "out" "dev" ]; + + buildInputs = [ libjpeg libpng libmng lcms1 libtiff openexr mesa_noglu libX11 ] ++ stdenv.lib.optionals stdenv.isDarwin [ OpenGL ]; nativeBuildInputs = [ pkgconfig ]; @@ -40,6 +40,8 @@ stdenv.mkDerivation rec { ./il_endian.h.patch ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { homepage = http://openil.sourceforge.net/; description = "An image library which can can load, save, convert, manipulate, filter and display a wide variety of image formats"; |