diff options
| author | Will Dietz <w@wdtz.org> | 2019-05-03 02:19:06 -0500 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-05-04 17:33:46 +0200 |
| commit | 1b0cd28a51db1759a04bb437ad7ad10f0602041c (patch) | |
| tree | 988f8422df74c28394b02cc4bd69efbf9feb18ce /pkgs/tools/compression | |
| parent | 8bd018bc19385c87fb93f26737a470a412459fcf (diff) | |
| download | nixpkgs-1b0cd28a51db1759a04bb437ad7ad10f0602041c.tar nixpkgs-1b0cd28a51db1759a04bb437ad7ad10f0602041c.tar.gz nixpkgs-1b0cd28a51db1759a04bb437ad7ad10f0602041c.tar.bz2 nixpkgs-1b0cd28a51db1759a04bb437ad7ad10f0602041c.tar.lz nixpkgs-1b0cd28a51db1759a04bb437ad7ad10f0602041c.tar.xz nixpkgs-1b0cd28a51db1759a04bb437ad7ad10f0602041c.tar.zst nixpkgs-1b0cd28a51db1759a04bb437ad7ad10f0602041c.zip | |
lz4: pick upstream fix for Darwin, move to pname
Diffstat (limited to 'pkgs/tools/compression')
| -rw-r--r-- | pkgs/tools/compression/lz4/default.nix | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix index 3ca56e91a9e..3f2497cd8d2 100644 --- a/pkgs/tools/compression/lz4/default.nix +++ b/pkgs/tools/compression/lz4/default.nix @@ -1,18 +1,26 @@ -{ stdenv, fetchFromGitHub, valgrind +{ stdenv, fetchFromGitHub, valgrind, fetchpatch , enableStatic ? false, enableShared ? true }: stdenv.mkDerivation rec { - name = "lz4-${version}"; + pname = "lz4"; version = "1.9.1"; src = fetchFromGitHub { sha256 = "1l1caxrik1hqs40vj3bpv1pikw6b74cfazv5c0v6g48zpcbmshl0"; rev = "v${version}"; - repo = "lz4"; - owner = "lz4"; + repo = pname; + owner = pname; }; + patches = [ + # Fix detection of Darwin + (fetchpatch { + url = "https://github.com/lz4/lz4/commit/024216ef7394b6411eeaa5b52d0cec9953a44249.patch"; + sha256 = "0j0j2pr6pkplxf083hlwl5q4cfp86q3wd8mc64bcfcr7ysc5pzl3"; + }) + ]; + outputs = [ "out" "dev" ]; buildInputs = stdenv.lib.optional doCheck valgrind; |