diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-01-24 09:30:01 +0200 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-01-24 10:03:38 +0200 |
commit | 8eb5d7d037a484b6c33f035687a0cf22f2600128 (patch) | |
tree | 2b9c5cd57f324251ed63f30c75ebfd72da51f71e /pkgs/development | |
parent | 04c5830432165e60d5ef7bc77ea13618d9943fc5 (diff) | |
download | nixlib-8eb5d7d037a484b6c33f035687a0cf22f2600128.tar nixlib-8eb5d7d037a484b6c33f035687a0cf22f2600128.tar.gz nixlib-8eb5d7d037a484b6c33f035687a0cf22f2600128.tar.bz2 nixlib-8eb5d7d037a484b6c33f035687a0cf22f2600128.tar.lz nixlib-8eb5d7d037a484b6c33f035687a0cf22f2600128.tar.xz nixlib-8eb5d7d037a484b6c33f035687a0cf22f2600128.tar.zst nixlib-8eb5d7d037a484b6c33f035687a0cf22f2600128.zip |
treewide: Mass replace 'ncurses}/lib' to refer the 'lib' output
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/compilers/ghc/8.0.1.nix | 2 | ||||
-rw-r--r-- | pkgs/development/mobile/androidenv/androidndk_r8e.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix index b262a448d4da..6e9f4691f73b 100644 --- a/pkgs/development/compilers/ghc/8.0.1.nix +++ b/pkgs/development/compilers/ghc/8.0.1.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-gcc=${stdenv.cc}/bin/cc" "--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp.out}/lib" - "--with-curses-includes=${ncurses}/include" "--with-curses-libraries=${ncurses}/lib" + "--with-curses-includes=${ncurses}/include" "--with-curses-libraries=${ncurses.lib}/lib" ] ++ stdenv.lib.optional stdenv.isDarwin [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ]; diff --git a/pkgs/development/mobile/androidenv/androidndk_r8e.nix b/pkgs/development/mobile/androidenv/androidndk_r8e.nix index d3f66c918ec7..ee649eb89b47 100644 --- a/pkgs/development/mobile/androidenv/androidndk_r8e.nix +++ b/pkgs/development/mobile/androidenv/androidndk_r8e.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { \( -type f -a -name "*.so*" \) -o \ \( -type f -a -perm -0100 \) \ \) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \ - --set-rpath ${zlib}/lib:${ncurses}/lib {} \; + --set-rpath ${zlib}/lib:${ncurses.lib}/lib {} \; # fix ineffective PROGDIR / MYNDKDIR determination for i in ndk-build ndk-gdb ndk-gdb-py do |