diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2022-06-27 22:45:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-27 22:45:34 +0200 |
| commit | 27b96f26ddf8d2e6c795642e7d9c5b9e9aa2d4a8 (patch) | |
| tree | d4783a3ee172f7785917f4850541948f310741e7 /pkgs | |
| parent | 13df7151e1fbe1c40f2d29d7aa58895861f72713 (diff) | |
| parent | 2515ea7edae75b29d9bc4dfcb5b9920de777b241 (diff) | |
Merge pull request #178974 from symphorien/lnav-static
lnav: fix static build
Diffstat (limited to 'pkgs')
| -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 |