From cec12416773c0bde99bcb80f8e2fe9482a6a5352 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 13 Nov 2016 16:18:43 -0600 Subject: [PATCH 1/6] pygobject3: multiple outputs --- pkgs/development/python-modules/pygobject/3.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index dfddd7dddbdb..33bb1d5a4cab 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -10,6 +10,8 @@ mkPythonDerivation rec { sha256 = "08b29cfb08efc80f7a8630a2734dec65a99c1b59f1e5771c671d2e4ed8a5cbe7"; }; + outputs = [ "out" "dev" ]; + buildInputs = [ pkgconfig glib gobjectIntrospection ] ++ stdenv.lib.optionals stdenv.isDarwin [ which ncurses ]; propagatedBuildInputs = [ pycairo cairo ]; From 6f36042eeaf9a9d7627c8b854bfde593888716ef Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 13 Nov 2016 20:29:03 -0600 Subject: [PATCH 2/6] atkmm: multiple outputs --- pkgs/development/libraries/atkmm/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/atkmm/default.nix b/pkgs/development/libraries/atkmm/default.nix index a10d730d06e4..e1cfb488be88 100644 --- a/pkgs/development/libraries/atkmm/default.nix +++ b/pkgs/development/libraries/atkmm/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "ff95385759e2af23828d4056356f25376cfabc41e690ac1df055371537e458bd"; }; + outputs = [ "out" "dev" ]; + propagatedBuildInputs = [ atk glibmm ]; nativeBuildInputs = [ pkgconfig ]; From 13bef32e735f49e261e914d4c33b5584ec7f2e1e Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 13 Nov 2016 20:29:18 -0600 Subject: [PATCH 3/6] cairomm: multiple outputs --- pkgs/development/libraries/cairomm/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix index fbf3cd57e3b9..017516f6b490 100644 --- a/pkgs/development/libraries/cairomm/default.nix +++ b/pkgs/development/libraries/cairomm/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "a54ada8394a86182525c0762e6f50db6b9212a2109280d13ec6a0b29bfd1afe6"; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ cairo libsigcxx ]; buildInputs = [ fontconfig freetype ] From c871bb489b472aeb87323161d666639cfc09d959 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 13 Nov 2016 20:29:37 -0600 Subject: [PATCH 4/6] gtkmm2: multiple outputs --- pkgs/development/libraries/gtkmm/2.x.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/development/libraries/gtkmm/2.x.nix index 119e3f77f670..1ec2a7cd6f0d 100644 --- a/pkgs/development/libraries/gtkmm/2.x.nix +++ b/pkgs/development/libraries/gtkmm/2.x.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0680a53b7bf90b4e4bf444d1d89e6df41c777e0bacc96e9c09fc4dd2f5fe6b72"; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [pkgconfig]; propagatedBuildInputs = [ glibmm gtk2 atkmm cairomm pangomm ]; From a6c2b2ef0efb15fc2e60ae8a99c28b1daa003309 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 13 Nov 2016 20:29:46 -0600 Subject: [PATCH 5/6] gtkmm3: multiple outputs --- pkgs/development/libraries/gtkmm/3.x.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index 8b2383f33cce..49055f6b4a95 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { sha256 = "05da4d4b628fb20c8384630ddf478a3b5562952b2d6181fe28d58f6cbc0514f5"; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ epoxy ]; From 992bc3e762e9bc6b3edeaffe516fd31d1dad871b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 14 Nov 2016 09:35:46 -0600 Subject: [PATCH 6/6] pangomm: multiple outputs --- pkgs/development/libraries/pangomm/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix index 6850c13b44e9..b99498f2013e 100644 --- a/pkgs/development/libraries/pangomm/default.nix +++ b/pkgs/development/libraries/pangomm/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { sha256 = "9762ee2a2d5781be6797448d4dd2383ce14907159b30bc12bf6b08e7227be3af"; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pango glibmm cairomm ];