From afc01cde320222bce53dcc75680c1eb499c08651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 13 Oct 2015 20:00:20 +0200 Subject: [PATCH] readline-6.3 (the default): split dev and doc outputs --- pkgs/desktops/gnome-3/3.16/core/gjs/default.nix | 2 +- pkgs/desktops/gnome-3/3.18/core/gjs/default.nix | 2 +- pkgs/development/libraries/readline/6.3.nix | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.16/core/gjs/default.nix b/pkgs/desktops/gnome-3/3.16/core/gjs/default.nix index 792e34c7b14..ac53726bc53 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gjs/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gjs/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ spidermonkey_24 ]; postInstall = '' - sed 's|-lreadline|-L${readline}/lib -lreadline|g' -i $out/lib/libgjs.la + sed 's|-lreadline|-L${readline.out}/lib -lreadline|g' -i $out/lib/libgjs.la ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.18/core/gjs/default.nix b/pkgs/desktops/gnome-3/3.18/core/gjs/default.nix index 792e34c7b14..ac53726bc53 100644 --- a/pkgs/desktops/gnome-3/3.18/core/gjs/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/gjs/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ spidermonkey_24 ]; postInstall = '' - sed 's|-lreadline|-L${readline}/lib -lreadline|g' -i $out/lib/libgjs.la + sed 's|-lreadline|-L${readline.out}/lib -lreadline|g' -i $out/lib/libgjs.la ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/readline/6.3.nix b/pkgs/development/libraries/readline/6.3.nix index f770fabb35d..11d4271b168 100644 --- a/pkgs/development/libraries/readline/6.3.nix +++ b/pkgs/development/libraries/readline/6.3.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0hzxr9jxqqx5sxsv9vmlxdnvlr9vi4ih1avjb869hbs6p5qn1fjn"; }; + outputs = [ "dev" "out" "doc" ]; + propagatedBuildInputs = [ncurses]; patchFlags = "-p0";