gstreamer-1.0: multiple outputs

13 files changed, 39 insertions, 3 deletions

diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index add3026275f..c47de95c2ad 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -34,6 +34,8 @@ stdenv.mkDerivation rec {
     sha256 = "03m99igngm37653353n5d724bcqw7p6hw6xjw0i2824523fpcqqi";
   };
 
+  outputs = [ "dev" "out" ];
+
   nativeBuildInputs = [ pkgconfig python ];
 
   buildInputs = [
diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index b2fff30197c..176eb404f00 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
     sha256 = "08hmg7fp519wim1fm04r7f2q2020ssdninawqsbrqjsvs70srh5b";
   };
 
+  outputs = [ "dev" "out" ];
+
   nativeBuildInputs = [
     pkgconfig python gobjectIntrospection
   ];
@@ -31,7 +33,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ gstreamer ];
 
-  configureFlags = if stdenv.isDarwin then [ 
+  configureFlags = if stdenv.isDarwin then [
     # Does not currently build on Darwin
     "--disable-libvisual"
     # Undefined symbols _cdda_identify and _cdda_identify_scsi in cdparanoia
diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix
index 40caf4093f0..162f407dd59 100644
--- a/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/pkgs/development/libraries/gstreamer/core/default.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
     sha256 = "1p5y9bbrhywng0prmpxv29p6jsz6vd039d49bnc98p9b45532yll";
   };
 
+  outputs = [ "dev" "out" ];
+
   nativeBuildInputs = [
     pkgconfig perl bison flex python gobjectIntrospection makeWrapper
   ];
@@ -29,5 +31,10 @@ stdenv.mkDerivation rec {
     done
   '';
 
+  preFixup = ''
+    moveToOutput "bin" "$dev"
+    moveToOutput "share/bash-completion" "$dev"
+  '';
+
   setupHook = ./setup-hook.sh;
 }
diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix
index e47ecfa01aa..0b48d87b90a 100644
--- a/pkgs/development/libraries/gstreamer/ges/default.nix
+++ b/pkgs/development/libraries/gstreamer/ges/default.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
     sha256 = "1gisdfa91kq89bsmbvb47alaxh8lpqmr6f3dzlwmf389nkandw2h";
   };
 
+  outputs = [ "dev" "out" ];
+
   nativeBuildInputs = [ pkgconfig python gobjectIntrospection flex perl ];
 
   propagatedBuildInputs = [ gnonlin libxml2 ];
diff --git a/pkgs/development/libraries/gstreamer/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/gnonlin/default.nix
index 9d43f3ac23c..db29413476f 100644
--- a/pkgs/development/libraries/gstreamer/gnonlin/default.nix
+++ b/pkgs/development/libraries/gstreamer/gnonlin/default.nix
@@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
     sha256 = "0zv60rq2h736a6fivd3a3wp59dj1jar7b2vwzykahvl168b7wrid";
   };
 
+  outputs = [ "dev" "out" ];
+
   nativeBuildInputs = [ pkgconfig ];
 
   propagatedBuildInputs = [ gst-plugins-base ];
diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index 54175fb83fb..d14a99ce56b 100644
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -29,6 +29,8 @@ stdenv.mkDerivation rec {
     sha256 = "0kczdvqxvl8kxiy2d7czv16jp73hv9k3nykh47ckihnv8x6i6362";
   };
 
+  outputs = [ "dev" "out" ];
+
   nativeBuildInputs = [ pkgconfig python ];
 
   buildInputs = [
@@ -40,5 +42,10 @@ stdenv.mkDerivation rec {
   ++ libintlOrEmpty
   ++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 ];
 
+  preFixup = ''
+    mkdir -p "$dev/lib/gstreamer-1.0"
+    mv "$out/lib/gstreamer-1.0/"*.la "$dev/lib/gstreamer-1.0"
+  '';
+
   LDFLAGS = optionalString stdenv.isDarwin "-lintl";
 }
diff --git a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix
index 692310be0ba..9b7db6d4732 100644
--- a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix
+++ b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix
@@ -11,13 +11,15 @@ stdenv.mkDerivation rec {
     url    = "mirror://gnome/sources/gstreamermm/${ver_maj}/${name}.tar.xz";
     sha256 = "0bj6and9b26d32bq90l8nx5wqh2ikkh8dm7qwxyxfdvmrzhixhgi";
   };
- 
+
+  outputs = [ "dev" "out" ];
+
   nativeBuildInputs = [ pkgconfig file ];
 
   propagatedBuildInputs = [ glibmm gst_all_1.gst-plugins-base ];
 
   enableParallelBuilding = true;
- 
+
   meta = with stdenv.lib; {
     description = "C++ interface for GStreamer";
     homepage = http://gstreamer.freedesktop.org/bindings/cplusplus.html;
diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix
index e4daa642ba0..ad3bdb81858 100644
--- a/pkgs/development/libraries/gstreamer/libav/default.nix
+++ b/pkgs/development/libraries/gstreamer/libav/default.nix
@@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
     sha256 = "0719njp8aarhvn038pijq6dmsnli0zlg146hyfs3rsdffs4f472s";
   };
 
+  outputs = [ "dev" "out" ];
+
   configureFlags = stdenv.lib.optionalString withSystemLibav
     "--with-system-libav";
 
diff --git a/pkgs/development/libraries/gstreamer/python/default.nix b/pkgs/development/libraries/gstreamer/python/default.nix
index 5320fdfaced..6d018c36f56 100644
--- a/pkgs/development/libraries/gstreamer/python/default.nix
+++ b/pkgs/development/libraries/gstreamer/python/default.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
 
   patches = [ ./different-path-with-pygobject.patch ];
 
+  outputs = [ "dev" "out" ];
+
   nativeBuildInputs = [ pkgconfig python ];
 
   # XXX: in the Libs.private field of python3.pc
diff --git a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix
index 3bd840dcd7e..675fdf322e8 100644
--- a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
     })
   ];
 
+  outputs = [ "dev" "out" ];
+
   buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base glib qt4 ];
   propagatedBuildInputs = [ boost ];
   nativeBuildInputs = [ cmake automoc4 flex bison pkgconfig ];
diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix
index 8f8437ad4ac..3b17c548ba2 100644
--- a/pkgs/development/libraries/gstreamer/ugly/default.nix
+++ b/pkgs/development/libraries/gstreamer/ugly/default.nix
@@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
     sha256 = "137b6kqykh5nwbmiv28nn1pc1d2x2rb2xxg382pc9pa9gpxpyrak";
   };
 
+  outputs = [ "dev" "out" ];
+
   nativeBuildInputs = [ pkgconfig python ];
 
   buildInputs = [
diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix
index a9aa3d73fa2..18394193706 100644
--- a/pkgs/development/libraries/gstreamer/vaapi/default.nix
+++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
     sha256 = "14jal2g5mf8r59w8420ixl3kg50vcmy56446ncwd0xrizd6yms5b";
   };
 
+  outputs = [ "dev" "out" ];
+
   nativeBuildInputs = with stdenv.lib; [ pkgconfig bzip2 ];
 
   buildInputs = [
diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix
index 1c123621664..02ce69af907 100644
--- a/pkgs/development/libraries/gstreamer/validate/default.nix
+++ b/pkgs/development/libraries/gstreamer/validate/default.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
     sha256 = "1pcy9pfffyk6xiw6aq38kbv7k24x2rljdy8fabjfy1abpmvvfrkn";
   };
 
+  outputs = [ "dev" "out" ];
+
   nativeBuildInputs = [
     pkgconfig gobjectIntrospection
   ];