From 218713aa3d05ecba57884ce3624d971217443b66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 14 Feb 2017 00:09:21 +0100 Subject: [PATCH] guile*: split outputs to fix #22757 The main aim is to decouple propagatedBuildInputs from $out. --- pkgs/development/interpreters/guile/1.8.nix | 3 +++ pkgs/development/interpreters/guile/default.nix | 3 +++ 2 files changed, 6 insertions(+) diff --git a/pkgs/development/interpreters/guile/1.8.nix b/pkgs/development/interpreters/guile/1.8.nix index 5db3f10fb07d..c50a5fbab077 100644 --- a/pkgs/development/interpreters/guile/1.8.nix +++ b/pkgs/development/interpreters/guile/1.8.nix @@ -11,6 +11,9 @@ stdenv.mkDerivation rec { patches = [ ./cpp-4.5.patch ]; + outputs = [ "out" "dev" "info" ]; + setOutputFlags = false; # $dev gets into the library otherwise + # GCC 4.6 raises a number of set-but-unused warnings. configureFlags = [ "--disable-error-on-warning" ]; diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 0283f7774857..fa8bd29bd684 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -14,6 +14,9 @@ sha256 = "12yqkr974y91ylgw6jnmci2v90i90s7h9vxa4zk0sai8vjnz4i1p"; }; + outputs = [ "out" "dev" "info" ]; + setOutputFlags = false; # $dev gets into the library otherwise + nativeBuildInputs = [ makeWrapper gawk pkgconfig ]; buildInputs = [ readline libtool libunistring libffi ]; propagatedBuildInputs = [ gmp boehmgc ]