Split a few libraries into multiple outputs

4 files changed, 67 insertions, 2 deletions

diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix
index fa201d20c3fba..3f00d6b834ed4 100644
--- a/pkgs/applications/audio/flac/default.nix
+++ b/pkgs/applications/audio/flac/default.nix
@@ -18,6 +18,23 @@ stdenv.mkDerivation rec {
       })
     ];
 
+  enableParallelBuilding = true;
+
+  outputs = [ "dev" "out" "bin" "doc" ];
+
+  configureFlags = [ "--bindir=$(bin)/bin" "--includedir=$(dev)/include" "--mandir=$(bin)/share/man" ];
+
+  installFlags = [ "pkgconfigdir=$(dev)/lib/pkgconfig m4datadir=$(dev)/share/aclocal" ];
+
+  postInstall =
+    ''
+      if [ -e $out/share/doc ]; then
+        mkdir -p $doc/share/doc
+        mv $out/share/doc/* $doc/share/doc
+        rmdir $out/share/doc
+      fi
+    ''; # */
+
   meta = {
     homepage = http://flac.sourceforge.net;
     description = "Library and tools for encoding and decoding the FLAC lossless audio file format";
diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/development/libraries/libogg/default.nix
index e407b75c8bbe3..0b5e4e8174151 100644
--- a/pkgs/development/libraries/libogg/default.nix
+++ b/pkgs/development/libraries/libogg/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "libogg-1.3.0";
-  
+
   src = fetchurl {
     url = "http://downloads.xiph.org/releases/ogg/${name}.tar.xz";
     sha256 = "0jy79ffkl34vycnwfsj4svqsdg1lwy2l1rr49y8r4d44kh12a5r3";
@@ -10,6 +10,21 @@ stdenv.mkDerivation rec {
 
   buildNativeInputs = [ xz ];
 
+  outputs = [ "dev" "doc" "out" ];
+
+  configureFlags = [ "--includedir=$(dev)/include" ];
+
+  installFlags = [ "pkgconfigdir=$(dev)/lib/pkgconfig" ];
+
+  postInstall =
+    ''
+      mkdir -p $doc/share/doc
+      mv $out/share/doc/* $doc/share/doc
+
+      mkdir -p $dev/nix-support
+      echo $out > $dev/nix-support/propagated-build-native-inputs
+    ''; # */
+
   meta = {
     homepage = http://xiph.org/ogg/;
   };
diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix
index d9b4afbf0ff84..3a9153120be15 100644
--- a/pkgs/development/libraries/libsndfile/default.nix
+++ b/pkgs/development/libraries/libsndfile/default.nix
@@ -10,6 +10,23 @@ stdenv.mkDerivation rec {
 
   buildInputs = [pkgconfig flac libogg libvorbis];
 
+  enableParallelBuilding = true;
+
+  outputs = [ "dev" "out" "bin" "doc" ];
+
+  configureFlags = [ "--bindir=$(bin)/bin" "--includedir=$(dev)/include" "--mandir=$(bin)/share/man" ];
+
+  installFlags = [ "pkgconfigdir=$(dev)/lib/pkgconfig m4datadir=$(dev)/share/aclocal" ];
+
+  postInstall =
+    ''
+      if [ -e $out/share/doc ]; then
+        mkdir -p $doc/share/doc
+        mv $out/share/doc/* $doc/share/doc
+        rmdir $out/share/doc
+      fi
+    ''; # */
+
   meta = {
     description = "Libsndfile, a C library for reading and writing files containing sampled sound";
 
diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix
index efb210d657629..945bba3d4ea17 100644
--- a/pkgs/development/libraries/libvorbis/default.nix
+++ b/pkgs/development/libraries/libvorbis/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "libvorbis-1.3.3";
-  
+
   src = fetchurl {
     url = "http://downloads.xiph.org/releases/vorbis/${name}.tar.xz";
     sha256 = "1gby6hapz9njx4l9g0pndyk4q83z5fgrgc30mfwfgx7bllspsk43";
@@ -11,6 +11,22 @@ stdenv.mkDerivation rec {
   buildNativeInputs = [ xz ];
   propagatedBuildInputs = [ libogg ];
 
+  outputs = [ "dev" "out" "doc" ];
+
+  configureFlags = [ "--includedir=$(dev)/include" ];
+
+  installFlags = [ "pkgconfigdir=$(dev)/lib/pkgconfig" ];
+
+  postInstall =
+    ''
+      mkdir -p $doc/share/doc
+      mv $out/share/doc/* $doc/share/doc
+
+      mkdir -p "$dev/nix-support"
+      echo "$propagatedBuildNativeInputs $out" > "$dev/nix-support/propagated-build-native-inputs"
+      propagatedBuildNativeInputs=
+    ''; # */
+
   meta = {
     homepage = http://xiph.org/vorbis/;
   };