From f66271238eeaa740f02615579d33eab96073fe0a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Sat, 5 Nov 2016 20:17:42 +0100
Subject: libdevil: Use multiple outputs

---
 pkgs/development/libraries/libdevil/default.nix | 14 ++++++++------
 pkgs/top-level/all-packages.nix                 |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix
index 3b63ba98f572..68bd72f3e0f5 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";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5c498628cb7b..35eee630c28a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7685,7 +7685,7 @@ in
 
   libdevil-nox = libdevil.override {
     libX11 = null;
-    mesa = null;
+    mesa_noglu = null;
   };
 
   libdigidoc = callPackage ../development/libraries/libdigidoc { };
-- 
cgit 1.4.1