diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-22 12:09:23 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-22 12:09:23 +0200 |
| commit | c4661e96434118637a5c41511a6c7f015726396f (patch) | |
| tree | edd7a4026fd903cddfb32b27f629af7f5c110fa8 /pkgs/tools/text | |
| parent | bfd522da633bd904918a939b29f0a0ebb594fa6b (diff) | |
| parent | c02f0ade90c2ba28063dc21a8cbdad50b777f403 (diff) | |
| download | nixlib-c4661e96434118637a5c41511a6c7f015726396f.tar nixlib-c4661e96434118637a5c41511a6c7f015726396f.tar.gz nixlib-c4661e96434118637a5c41511a6c7f015726396f.tar.bz2 nixlib-c4661e96434118637a5c41511a6c7f015726396f.tar.lz nixlib-c4661e96434118637a5c41511a6c7f015726396f.tar.xz nixlib-c4661e96434118637a5c41511a6c7f015726396f.tar.zst nixlib-c4661e96434118637a5c41511a6c7f015726396f.zip | |
Merge: make dev output references explicit
This is a rebase of most commits from #14766, resolving conflicts and a few other evaluation problems.
Diffstat (limited to 'pkgs/tools/text')
| -rw-r--r-- | pkgs/tools/text/gawk/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/text/xml/xmlstarlet/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index 8578960b9875..c7e0857c2ca4 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional stdenv.isDarwin locale; configureFlags = stdenv.lib.optional (stdenv.system != "x86_64-cygwin") "--with-libsigsegv-prefix=${libsigsegv}" - ++ [(if interactive then "--with-readline=${readline}" else "--without-readline")]; + ++ [(if interactive then "--with-readline=${readline.dev}" else "--without-readline")]; postInstall = "rm $out/bin/gawk-*"; diff --git a/pkgs/tools/text/xml/xmlstarlet/default.nix b/pkgs/tools/text/xml/xmlstarlet/default.nix index 74f7e08900a7..b390a9c404a3 100644 --- a/pkgs/tools/text/xml/xmlstarlet/default.nix +++ b/pkgs/tools/text/xml/xmlstarlet/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { preConfigure = '' - export LIBXSLT_PREFIX=${libxslt} + export LIBXSLT_PREFIX=${libxslt.dev} export LIBXML_PREFIX=${libxml2} export LIBXSLT_LIBS=$(pkg-config --libs libxslt libexslt) export LIBXML_LIBS=$(pkg-config --libs libxml-2.0) |