diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-03-16 08:39:37 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-03-16 08:39:37 +0100 |
| commit | c643ccaa8c91f78b8c89eb87589886b8906d5b38 (patch) | |
| tree | 22e57f627266ba2940c4bbee62da17846472659a /pkgs/tools | |
| parent | 55b6c1792619085dd8aacf46b94e2f33303dd58e (diff) | |
| parent | da972b6cc40b4be7492df1661a522e12bf747807 (diff) | |
| download | nixlib-c643ccaa8c91f78b8c89eb87589886b8906d5b38.tar nixlib-c643ccaa8c91f78b8c89eb87589886b8906d5b38.tar.gz nixlib-c643ccaa8c91f78b8c89eb87589886b8906d5b38.tar.bz2 nixlib-c643ccaa8c91f78b8c89eb87589886b8906d5b38.tar.lz nixlib-c643ccaa8c91f78b8c89eb87589886b8906d5b38.tar.xz nixlib-c643ccaa8c91f78b8c89eb87589886b8906d5b38.tar.zst nixlib-c643ccaa8c91f78b8c89eb87589886b8906d5b38.zip | |
Merge #13950: move ncurses utilities to $out
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/misc/entr/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/system/gptfdisk/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix index a99e28c6f817..69ddbd6dbfe7 100644 --- a/pkgs/tools/misc/entr/default.nix +++ b/pkgs/tools/misc/entr/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace Makefile.bsd --replace /bin/echo echo substituteInPlace entr.c --replace /bin/cat ${coreutils}/bin/cat - substituteInPlace entr.c --replace /usr/bin/clear ${ncurses.dev}/bin/clear + substituteInPlace entr.c --replace /usr/bin/clear ${ncurses.out}/bin/clear substituteInPlace entr.1 --replace /bin/cat cat substituteInPlace entr.1 --replace /usr/bin/clear clear ''; diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix index 940383a6bc65..0b034819651d 100644 --- a/pkgs/tools/system/gptfdisk/default.nix +++ b/pkgs/tools/system/gptfdisk/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { substituteInPlace Makefile.mac --replace \ " -I/opt/local/include -I /usr/local/include -I/opt/local/include" "" substituteInPlace Makefile.mac --replace \ - "/opt/local/lib/libncurses.a" "${ncurses.lib}/lib/libncurses.dylib" + "/opt/local/lib/libncurses.a" "${ncurses.out}/lib/libncurses.dylib" ''; buildPhase = stdenv.lib.optionalString stdenv.isDarwin "make -f Makefile.mac"; |