summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2015-06-03 20:02:03 +0200
committerVladimír Čunát <vcunat@gmail.com>2015-06-07 09:22:35 +0200
commit317f4ea72df6f4ec07ef9967a8d286f0ba3de04b (patch)
tree367f6a7054e53e3cd629f132979d7c78cf4961ff /pkgs
parent4c475520d9561242fdaf403129b0226010677169 (diff)
downloadnixpkgs-317f4ea72df6f4ec07ef9967a8d286f0ba3de04b.tar
nixpkgs-317f4ea72df6f4ec07ef9967a8d286f0ba3de04b.tar.gz
nixpkgs-317f4ea72df6f4ec07ef9967a8d286f0ba3de04b.tar.bz2
nixpkgs-317f4ea72df6f4ec07ef9967a8d286f0ba3de04b.tar.lz
nixpkgs-317f4ea72df6f4ec07ef9967a8d286f0ba3de04b.tar.xz
nixpkgs-317f4ea72df6f4ec07ef9967a8d286f0ba3de04b.tar.zst
nixpkgs-317f4ea72df6f4ec07ef9967a8d286f0ba3de04b.zip
ncurses: header location fixes
- move headers directly to $out/include and set up symlinks.
Some packages were failing to find them (e.g. mariadb).
- postInstall was failing, only it was ignored due to a bug;
now it succeeds.
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/ncurses/default.nix4
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index d6c2ee4fade..19b1b5fe33b 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -54,6 +54,8 @@ stdenv.mkDerivation rec {
     ln -svf $cfg $out/bin/ncurses-config
 
     # Allow for end users who #include <ncurses?w/*.h>
+    mv "$out"/include/ncursesw/* "$out"/include/
+    rmdir "$out"/include/ncursesw
     ln -svf . $out/include/ncursesw
     ln -svf . $out/include/ncurses
 
@@ -83,6 +85,8 @@ stdenv.mkDerivation rec {
     ln -svf $cfg $out/bin/ncurses-config
 
     # Allow for end users who #include <ncurses/*.h>
+    mv "$out"/include/ncurses/* "$out"/include/
+    rmdir "$out"/include/ncurses
     ln -svf . $out/include/ncurses
 
     # Create curses compatability