From 8ec6f85c4eb91d70f6c371dbaf4a6edf60d15201 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 16 Oct 2015 21:49:59 +0300 Subject: [PATCH] gobject-introspection: Don't delete $out/share/gobject-introspection-1.0/tests Otherwise breaks pygobject3 compilation. vcunat added comment. (Commit reordering changed this a bit.) --- .../libraries/gobject-introspection/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 226fbd2835b..2de0d23d213 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -23,13 +23,17 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional stdenv.isDarwin otool; propagatedBuildInputs = [ libffi glib ]; - # Tests depend on cairo, which is undesirable (it pulls in lots of - # other dependencies). - configureFlags = [ "--disable-tests" ]; - preConfigure = '' sed 's|/usr/bin/env ||' -i tools/g-ir-tool-template.in ''; + configureFlags = [ + # Tests depend on cairo, which is undesirable (it pulls in lots of + # other dependencies). + "--disable-tests" + ]; + + # outputs TODO: share/gobject-introspection-1.0/tests is needed during build + # by pygobject3 (and maybe others), but it's only searched in $out setupHook = ./setup-hook.sh;