ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-15 13:37:21 +03:00
Code Issues Projects Releases Wiki Activity

libdevil: Use multiple outputs

Browse Source
This commit is contained in:
Eelco Dolstra 2016-11-05 20:17:42 +01:00
parent f3dbb0892c
commit f66271238e
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,12 +1,10 @@
{ stdenv, fetchurl, libjpeg, libpng, libmng, lcms1, libtiff, openexr, mesa { stdenv, fetchurl, libjpeg, libpng, libmng, lcms1, libtiff, openexr, mesa_noglu
, libX11, pkgconfig , libX11, pkgconfig, OpenGL
, OpenGL
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name ="libdevil-${version}"; name = "libdevil-${version}";
version = "1.7.8"; version = "1.7.8";
src = fetchurl { src = fetchurl {
@ -14,7 +12,9 @@ stdenv.mkDerivation rec {
sha256 = "1zd850nn7nvkkhasrv7kn17kzgslr5ry933v6db62s4lr0zzlbv8"; 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 ]; ++ stdenv.lib.optionals stdenv.isDarwin [ OpenGL ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
@ -40,6 +40,8 @@ stdenv.mkDerivation rec {
./il_endian.h.patch ./il_endian.h.patch
]; ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://openil.sourceforge.net/; 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"; description = "An image library which can can load, save, convert, manipulate, filter and display a wide variety of image formats";

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

@ -7685,7 +7685,7 @@ in
libdevil-nox = libdevil.override { libdevil-nox = libdevil.override {
libX11 = null; libX11 = null;
mesa = null; mesa_noglu = null;
}; };
libdigidoc = callPackage ../development/libraries/libdigidoc { }; libdigidoc = callPackage ../development/libraries/libdigidoc { };