From d28e5f1c61e160ddc8bcdc93b11c4cda0f7a9a91 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Sun, 21 Jun 2015 00:57:17 -0700
Subject: [PATCH] fix ncurses pkgconfig path a final time
---
pkgs/development/libraries/ncurses/default.nix | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 7315d0679bb..15e711b096b 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -30,7 +30,10 @@ stdenv.mkDerivation rec {
buildInputs = lib.optional (mouseSupport && stdenv.isLinux) gpm;
- preConfigure = lib.optionalString stdenv.isCygwin ''
+ preConfigure = ''
+ export PKG_CONFIG_LIBDIR="$out/lib/pkgconfig"
+ mkdir -p "$PKG_CONFIG_LIBDIR"
+ '' + lib.optionalString stdenv.isCygwin ''
sed -i -e 's,LIB_SUFFIX="t,LIB_SUFFIX=",' configure
'';
@@ -40,11 +43,6 @@ stdenv.mkDerivation rec {
doCheck = false;
- # The install expects the pkgconfig directory to exist in 5.9
- preInstall = ''
- mkdir -p "$out/lib/pkgconfig"
- '';
-
# When building a wide-character (Unicode) build, create backward
# compatibility links from the the "normal" libraries to the
# wide-character libraries (e.g. libncurses.so to libncursesw.so).