public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2020-02-11 07:59:53 +01:00
parent 2cf319879b 4959c970ee
commit 1a6c3cb06b
33 changed files with 264 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
];
# TODO(@Ericson2314): Separate binaries and libraries
outputs = [ "out" "dev" ];
outputs = [ "bin" "out" "dev" ];
buildInputs = stdenv.lib.optional doCheck valgrind;
@@ -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"
;
@@ -53,8 +48,9 @@ stdenv.mkDerivation rec {
mv $out/bin/*.dll $out/lib
ln -s $out/lib/*.dll
''
# TODO remove
+ stdenv.lib.optionalString (!enableStatic) "rm $out/lib/*.a";
+ ''
moveToOutput bin "$bin"
'';
meta = with stdenv.lib; {
description = "Extremely fast compression algorithm";