diff options
Diffstat (limited to 'pkgs/tools/compression/lz4/default.nix')
-rw-r--r-- | pkgs/tools/compression/lz4/default.nix | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix index 3ce0eac3fc5c..fd967fce9c6c 100644 --- a/pkgs/tools/compression/lz4/default.nix +++ b/pkgs/tools/compression/lz4/default.nix @@ -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"; |