ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-28 14:22:50 +03:00
Code Issues Projects Releases Wiki Activity

lz4: do the refactoring forgotten after PR #51965

Browse Source
This commit is contained in:
Vladimír Čunát 2020-02-10 21:30:50 +01:00
parent 5ff9a68101
commit 35b13b52cd
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/tools/compression/lz4/default.nix
View File

@ -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";