diff options
| -rw-r--r-- | pkgs/development/libraries/pcre/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/misc/lnav/default.nix | 25 |
2 files changed, 22 insertions, 5 deletions
diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index 9d4e52acb4d9d..c4bbcf2ddfd63 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { postFixup = '' moveToOutput bin/pcre-config "$dev" '' + optionalString (variant != null) '' - ln -sf -t "$out/lib/" '${pcre.out}'/lib/libpcre{,posix}.{so.*.*.*,*dylib} + ln -sf -t "$out/lib/" '${pcre.out}'/lib/libpcre{,posix}.{so.*.*.*,*dylib,*a} ''; meta = { diff --git a/pkgs/tools/misc/lnav/default.nix b/pkgs/tools/misc/lnav/default.nix index ce541e8f567f3..d88ea9b750a3e 100644 --- a/pkgs/tools/misc/lnav/default.nix +++ b/pkgs/tools/misc/lnav/default.nix @@ -1,5 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, pcre-cpp, sqlite, ncurses -, readline, zlib, bzip2, autoconf, automake, curl }: +{ lib +, stdenv +, fetchFromGitHub +, pcre-cpp +, sqlite +, ncurses +, readline +, zlib +, bzip2 +, autoconf +, automake +, curl +, buildPackages +}: stdenv.mkDerivation rec { pname = "lnav"; @@ -20,9 +32,14 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ autoconf automake ]; - buildInputs = [ + strictDeps = true; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ + autoconf + automake zlib + ]; + buildInputs = [ bzip2 ncurses pcre-cpp |