nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 09:53:10 +00:00
Code Issues Packages 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

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

@ -1,7 +1,5 @@
{ 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 {
@ -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";

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

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