diff options
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/archivers/sharutils/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/compression/lz4/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/compression/lz4/install-on-freebsd.patch | 54 |
3 files changed, 57 insertions, 1 deletions
diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix index a7135346d2fc..e806a962eabb 100644 --- a/pkgs/tools/archivers/sharutils/default.nix +++ b/pkgs/tools/archivers/sharutils/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { preConfigure = '' # Fix for building on Glibc 2.16. Won't be needed once the # gnulib in sharutils is updated. - sed -i ${stdenv.lib.optionalString ((stdenv.isFreeBSD || stdenv.isOpenBSD) && stdenv.cc.nativeTools) "''"} '/gets is a security hole/d' lib/stdio.in.h + sed -i ${stdenv.lib.optionalString (stdenv.isOpenBSD && stdenv.cc.nativeTools) "''"} '/gets is a security hole/d' lib/stdio.in.h ''; # GNU Gettext is needed on non-GNU platforms. diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix index 6c5d28d6bcc2..13236da5ab44 100644 --- a/pkgs/tools/compression/lz4/default.nix +++ b/pkgs/tools/compression/lz4/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { doCheck = false; # tests take a very long time checkTarget = "test"; + patches = [ ./install-on-freebsd.patch ] ; + meta = with stdenv.lib; { inherit version; description = "Extremely fast compression algorithm"; diff --git a/pkgs/tools/compression/lz4/install-on-freebsd.patch b/pkgs/tools/compression/lz4/install-on-freebsd.patch new file mode 100644 index 000000000000..12a2bf72f4ed --- /dev/null +++ b/pkgs/tools/compression/lz4/install-on-freebsd.patch @@ -0,0 +1,54 @@ +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 |