diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2020-08-23 02:00:50 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2020-08-23 02:00:50 +0200 |
commit | 91104b5417275b780f6947b46a5c1bcc0d99f10b (patch) | |
tree | f9530394ba9869c49b30171bb6006f04ba43abf8 /pkgs/tools/compression | |
parent | 4cf394ea3f173946363c40439b03ebcd92eb2bb4 (diff) | |
parent | ddfa22167019726c015a5638e815d028031162e8 (diff) | |
download | nixpkgs-91104b5417275b780f6947b46a5c1bcc0d99f10b.tar nixpkgs-91104b5417275b780f6947b46a5c1bcc0d99f10b.tar.gz nixpkgs-91104b5417275b780f6947b46a5c1bcc0d99f10b.tar.bz2 nixpkgs-91104b5417275b780f6947b46a5c1bcc0d99f10b.tar.lz nixpkgs-91104b5417275b780f6947b46a5c1bcc0d99f10b.tar.xz nixpkgs-91104b5417275b780f6947b46a5c1bcc0d99f10b.tar.zst nixpkgs-91104b5417275b780f6947b46a5c1bcc0d99f10b.zip |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/tools/compression')
-rw-r--r-- | pkgs/tools/compression/lzfse/default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/tools/compression/lzfse/default.nix b/pkgs/tools/compression/lzfse/default.nix index 0a335b3602f..bd97620dba6 100644 --- a/pkgs/tools/compression/lzfse/default.nix +++ b/pkgs/tools/compression/lzfse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "lzfse"; @@ -11,9 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1mfh6y6vpvxsdwmqmfbkqkwvxc0pz2dqqc72c6fk9sbsrxxaghd5"; }; - makeFlags = [ "INSTALL_PREFIX=$(out)" ]; - - enableParallelBuilding = false; #bug + nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { homepage = "https://github.com/lzfse/lzfse"; |