diff options
| author | Vaibhav Sagar <vaibhavsagar@gmail.com> | 2018-12-13 15:39:04 -0500 |
|---|---|---|
| committer | Vaibhav Sagar <vaibhavsagar@gmail.com> | 2018-12-13 18:00:26 -0500 |
| commit | cb5a7bdc3a486054003d2fb0ed06451af872fd30 (patch) | |
| tree | d7963ef07cda458cbc27d855bb97b56715da5fdc /pkgs | |
| parent | af2cebe78fd185d1bbabd071f85f74654602d042 (diff) | |
| download | nixpkgs-cb5a7bdc3a486054003d2fb0ed06451af872fd30.tar nixpkgs-cb5a7bdc3a486054003d2fb0ed06451af872fd30.tar.gz nixpkgs-cb5a7bdc3a486054003d2fb0ed06451af872fd30.tar.bz2 nixpkgs-cb5a7bdc3a486054003d2fb0ed06451af872fd30.tar.lz nixpkgs-cb5a7bdc3a486054003d2fb0ed06451af872fd30.tar.xz nixpkgs-cb5a7bdc3a486054003d2fb0ed06451af872fd30.tar.zst nixpkgs-cb5a7bdc3a486054003d2fb0ed06451af872fd30.zip | |
lz4: fix pkgsStatic build
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/compression/lz4/default.nix | 19 | ||||
| -rw-r--r-- | pkgs/top-level/static.nix | 4 |
2 files changed, 20 insertions, 3 deletions
diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix index 7e29ee2b856..d2b7969a183 100644 --- a/pkgs/tools/compression/lz4/default.nix +++ b/pkgs/tools/compression/lz4/default.nix @@ -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"; diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index 687e38dcc3a..e6ef50e7ee9 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -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 { |