Merge pull request #178974 from symphorien/lnav-static

lnav: fix static build
This commit is contained in:
Maximilian Bosch
2022-06-27 22:45:34 +02:00
committed by GitHub
2 changed files with 22 additions and 5 deletions
+1 -1
View File
@@ -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 = {
+21 -4
View File
@@ -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