diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-02-10 21:30:50 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2020-02-10 21:30:50 +0100 |
| commit | 35b13b52cd701e613ffb341977e3aa9efed1b9fc (patch) | |
| tree | ad165bf9226f923652518d1a0facc5734cf09b19 /pkgs/tools/compression/lz4 | |
| parent | 5ff9a681014710a4dda754ea4c65c9c4b7b3fce8 (diff) | |
| download | nixpkgs-35b13b52cd701e613ffb341977e3aa9efed1b9fc.tar nixpkgs-35b13b52cd701e613ffb341977e3aa9efed1b9fc.tar.gz nixpkgs-35b13b52cd701e613ffb341977e3aa9efed1b9fc.tar.bz2 nixpkgs-35b13b52cd701e613ffb341977e3aa9efed1b9fc.tar.lz nixpkgs-35b13b52cd701e613ffb341977e3aa9efed1b9fc.tar.xz nixpkgs-35b13b52cd701e613ffb341977e3aa9efed1b9fc.tar.zst nixpkgs-35b13b52cd701e613ffb341977e3aa9efed1b9fc.zip | |
lz4: do the refactoring forgotten after PR #51965
Diffstat (limited to 'pkgs/tools/compression/lz4')
| -rw-r--r-- | pkgs/tools/compression/lz4/default.nix | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix index 3ce0eac3fc5..81cb1ad9811 100644 --- a/pkgs/tools/compression/lz4/default.nix +++ b/pkgs/tools/compression/lz4/default.nix @@ -31,15 +31,10 @@ stdenv.mkDerivation rec { 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"}" - #"WINDRES:=${stdenv.cc.bintools.targetPrefix}windres" + "BUILD_STATIC=${if enableStatic then "yes" else "no"}" + "BUILD_SHARED=${if enableShared then "yes" else "no"}" + "WINDRES:=${stdenv.cc.bintools.targetPrefix}windres" ] - # TODO delete and do above - ++ stdenv.lib.optional (enableStatic) "BUILD_STATIC=yes" - ++ stdenv.lib.optional (!enableShared) "BUILD_SHARED=no" - ++ stdenv.lib.optional stdenv.hostPlatform.isMinGW "WINDRES:=${stdenv.cc.bintools.targetPrefix}windres" # TODO make full dictionary ++ stdenv.lib.optional stdenv.hostPlatform.isMinGW "TARGET_OS=MINGW" ; @@ -52,9 +47,7 @@ stdenv.mkDerivation rec { stdenv.lib.optionalString stdenv.hostPlatform.isWindows '' mv $out/bin/*.dll $out/lib ln -s $out/lib/*.dll - '' - # TODO remove - + stdenv.lib.optionalString (!enableStatic) "rm $out/lib/*.a"; + ''; meta = with stdenv.lib; { description = "Extremely fast compression algorithm"; |