mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 23:13:19 +00:00
Merge pull request #51965 from vaibhavsagar/fix-static-lz4
lz4: Fix pkgsStatic build
This commit is contained in:
commit
e0a4d1083f
@ -1,4 +1,6 @@
|
||||
{ stdenv, fetchFromGitHub, valgrind }:
|
||||
{ stdenv, fetchFromGitHub, valgrind
|
||||
, enableStatic ? false, enableShared ? true
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "lz4-${version}";
|
||||
@ -17,12 +19,23 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" "INCLUDEDIR=$(dev)/include" ];
|
||||
makeFlags = [
|
||||
"PREFIX=$(out)"
|
||||
"INCLUDEDIR=$(dev)/include"
|
||||
# TODO do this instead
|
||||
#"BUILD_STATIC=${if enableStatic then "yes" else "no"}"
|
||||
#"BUILD_SHARED=${if enableShared then "yes" else "no"}"
|
||||
]
|
||||
# TODO delete and do above
|
||||
++ stdenv.lib.optional (enableStatic) "BUILD_STATIC=yes"
|
||||
++ stdenv.lib.optional (!enableShared) "BUILD_SHARED=no"
|
||||
;
|
||||
|
||||
doCheck = false; # tests take a very long time
|
||||
checkTarget = "test";
|
||||
|
||||
postInstall = "rm $out/lib/*.a";
|
||||
# TODO remove
|
||||
postInstall = stdenv.lib.optionalString (!enableStatic) "rm $out/lib/*.a";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Extremely fast compression algorithm";
|
||||
|
@ -139,6 +139,10 @@ in {
|
||||
# it doesn’t like the --disable-shared flag
|
||||
stdenv = super.stdenv;
|
||||
};
|
||||
lz4 = super.lz4.override {
|
||||
enableShared = false;
|
||||
enableStatic = true;
|
||||
};
|
||||
|
||||
darwin = super.darwin // {
|
||||
libiconv = super.darwin.libiconv.override {
|
||||
|
Loading…
Reference in New Issue
Block a user