From dd6912a95e63dcedf1f84f2051ee9c597163fa48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 28 Oct 2015 11:59:42 +0100 Subject: [PATCH] gobject-introspection: auto-move *.gir into $dev --- .../libraries/gobject-introspection/default.nix | 9 +++++---- .../libraries/gobject-introspection/setup-hook.sh | 7 +++++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 2de0d23d2137..1a2ba3db29a9 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -15,10 +15,13 @@ stdenv.mkDerivation rec { url = "mirror://gnome/sources/gobject-introspection/${ver_maj}/${name}.tar.xz"; sha256 = "6658bd3c2b8813eb3e2511ee153238d09ace9d309e4574af27443d87423e4233"; }; + patches = [ ./absolute_shlib_path.patch ]; - outputs = [ "dev" "out" "doc" ]; + outputs = [ "dev" "out" ]; + outputBin = "dev"; + outputMan = "dev"; # tiny pages - buildInputs = [ flex bison pkgconfig python ] + buildInputs = [ flex bison pkgconfig python setupHook/*move .gir*/ ] ++ libintlOrEmpty ++ stdenv.lib.optional stdenv.isDarwin otool; propagatedBuildInputs = [ libffi glib ]; @@ -37,8 +40,6 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - patches = [ ./absolute_shlib_path.patch ]; - meta = with stdenv.lib; { description = "A middleware layer between C libraries and language bindings"; homepage = http://live.gnome.org/GObjectIntrospection; diff --git a/pkgs/development/libraries/gobject-introspection/setup-hook.sh b/pkgs/development/libraries/gobject-introspection/setup-hook.sh index d411ad69dc43..78a8ccf19d34 100644 --- a/pkgs/development/libraries/gobject-introspection/setup-hook.sh +++ b/pkgs/development/libraries/gobject-introspection/setup-hook.sh @@ -12,3 +12,10 @@ make_gobject_introspection_find_gir_files() { } envHooks+=(make_gobject_introspection_find_gir_files) + +_multioutMoveGlibGir() { + _moveToOutput share/gir-1.0 "${!outputDev}" +} + +preFixupHooks+=(_multioutMoveGlibGir) +