about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2015-10-13 20:00:20 +0200
committerVladimír Čunát <vcunat@gmail.com>2015-10-13 20:19:02 +0200
commitafc01cde320222bce53dcc75680c1eb499c08651 (patch)
treebf319b15064f6887f07359ad795ecfd534b04c5e
parentef3f961610cf32238f7037ca668ba9b89d2de026 (diff)
downloadnixlib-afc01cde320222bce53dcc75680c1eb499c08651.tar
nixlib-afc01cde320222bce53dcc75680c1eb499c08651.tar.gz
nixlib-afc01cde320222bce53dcc75680c1eb499c08651.tar.bz2
nixlib-afc01cde320222bce53dcc75680c1eb499c08651.tar.lz
nixlib-afc01cde320222bce53dcc75680c1eb499c08651.tar.xz
nixlib-afc01cde320222bce53dcc75680c1eb499c08651.tar.zst
nixlib-afc01cde320222bce53dcc75680c1eb499c08651.zip
readline-6.3 (the default): split dev and doc outputs
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/gjs/default.nix2
-rw-r--r--pkgs/desktops/gnome-3/3.18/core/gjs/default.nix2
-rw-r--r--pkgs/development/libraries/readline/6.3.nix2
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 792e34c7b148..ac53726bc537 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 792e34c7b148..ac53726bc537 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 f770fabb35d3..11d4271b168b 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";