diff options
author | Tobias Geerinckx-Rice <me@tobias.gr> | 2016-11-17 16:06:51 +0100 |
---|---|---|
committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2016-11-17 16:27:31 +0100 |
commit | 1f0a12ee8d59e6de3309f36b669997757e8dd54d (patch) | |
tree | 626b065c75b9e367b8d73960bb6a3899a73a500b /pkgs/tools/compression/lz4 | |
parent | 2c01da365410311fb3c044cdca85477241e2665f (diff) |
lz4: 131 -> 1.7.3
‘make install’ now supports FreeBSD out of the box (untested).
Diffstat (limited to 'pkgs/tools/compression/lz4')
-rw-r--r-- | pkgs/tools/compression/lz4/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/compression/lz4/install-on-freebsd.patch | 54 |
2 files changed, 3 insertions, 59 deletions
diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix index 4b2f0276d78c3..cff220950e2da 100644 --- a/pkgs/tools/compression/lz4/default.nix +++ b/pkgs/tools/compression/lz4/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "lz4-${version}"; - version = "131"; + version = "1.7.3"; src = fetchFromGitHub { - sha256 = "1bhvcq8fxxsqnpg5qa6k3nsyhq0nl0iarh08sqzclww27hlpyay2"; - rev = "r${version}"; + sha256 = "0b9yhgiqsdaqgq03vkgalrpbbw7p9a8n8j1nqipra5vw182jrvl0"; + rev = "v${version}"; repo = "lz4"; owner = "Cyan4973"; }; @@ -22,8 +22,6 @@ stdenv.mkDerivation rec { doCheck = false; # tests take a very long time checkTarget = "test"; - patches = [ ./install-on-freebsd.patch ] ; - postInstall = "rm $out/lib/*.a"; meta = with stdenv.lib; { diff --git a/pkgs/tools/compression/lz4/install-on-freebsd.patch b/pkgs/tools/compression/lz4/install-on-freebsd.patch deleted file mode 100644 index 12a2bf72f4edb..0000000000000 --- a/pkgs/tools/compression/lz4/install-on-freebsd.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff --git a/Makefile b/Makefile -index d1b0d0c..f8d6a2d 100644 ---- a/Makefile -+++ b/Makefile -@@ -80,8 +80,6 @@ clean: - - - #------------------------------------------------------------------------ --#make install is validated only for Linux, OSX, kFreeBSD and Hurd targets --ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU)) - - install: - @cd $(LZ4DIR); $(MAKE) -e install -@@ -129,4 +127,3 @@ examples: - prg-travis: - @cd $(PRGDIR); $(MAKE) -e test-travis - --endif -diff --git a/lib/Makefile b/lib/Makefile -index 02ddd3b..26ed18f 100644 ---- a/lib/Makefile -+++ b/lib/Makefile -@@ -80,8 +80,6 @@ clean: - - - #------------------------------------------------------------------------ --#make install is validated only for Linux, OSX, kFreeBSD and Hurd targets --ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU)) - - liblz4.pc: liblz4.pc.in Makefile - @echo creating pkgconfig -@@ -114,4 +112,3 @@ uninstall: - @[ -f $(DESTDIR)$(INCLUDEDIR)/lz4frame.h ] && rm -f $(DESTDIR)$(INCLUDEDIR)/lz4frame.h - @echo lz4 libraries successfully uninstalled - --endif -diff --git a/programs/Makefile b/programs/Makefile -index f422902..6943363 100644 ---- a/programs/Makefile -+++ b/programs/Makefile -@@ -113,8 +113,6 @@ clean: - - - #------------------------------------------------------------------------ --#make install is validated only for Linux, OSX, kFreeBSD and Hurd targets --ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU)) - - install: lz4 lz4c - @echo Installing binaries -@@ -307,4 +305,3 @@ test-mem: lz4 datagen fuzzer frametest fullbench - test-mem32: lz4c32 datagen - # unfortunately, valgrind doesn't seem to work with non-native binary. If someone knows how to do a valgrind-test on a 32-bits exe with a 64-bits system... - --endif |