From 9ffb7ecd24506a54b132f5601eb0e462f48c684c Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Thu, 4 Feb 2021 21:39:53 +0100 Subject: [PATCH] ncompress: 4.2.4.5 -> 4.2.4.6 --- pkgs/tools/compression/ncompress/default.nix | 4 ++-- .../compression/ncompress/makefile.patch | 19 ------------------- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/pkgs/tools/compression/ncompress/default.nix b/pkgs/tools/compression/ncompress/default.nix index 0f79811f9669..438e169d23c9 100644 --- a/pkgs/tools/compression/ncompress/default.nix +++ b/pkgs/tools/compression/ncompress/default.nix @@ -1,7 +1,7 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "ncompress-4.2.4.5"; + name = "ncompress-4.2.4.6"; builder = ./builder.sh; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/project/ncompress/${name}.tar.gz"; - sha256 = "0fwhfijnzggqpbmln82zq7zp6sra7p9arfakswicwi7qsp6vnxgm"; + sha256 = "0sw3c7h80v9pagfqfx16ws9w2y3yrajrdk54bgiwdm0b0q06lyzv"; }; meta = { diff --git a/pkgs/tools/compression/ncompress/makefile.patch b/pkgs/tools/compression/ncompress/makefile.patch index 49aa4e65c768..b61b1272f8bd 100644 --- a/pkgs/tools/compression/ncompress/makefile.patch +++ b/pkgs/tools/compression/ncompress/makefile.patch @@ -1,25 +1,6 @@ diff -Naur ncompress-4.2.4.2.orig/Makefile.def ncompress-4.2.4.2/Makefile.def --- ncompress-4.2.4.2.orig/Makefile.def 2007-09-06 22:28:42.000000000 -0500 +++ ncompress-4.2.4.2/Makefile.def 2009-08-18 12:30:53.000000000 -0500 -@@ -3,14 +3,16 @@ - # C complier - #CC=cc - -+PREFIX=/usr/local -+ - # Install prefix - DESTDIR= - - # Install directory for binarys --BINDIR=/usr/local/bin -+BINDIR=$(PREFIX)/bin - - # Install directory for manual --MANDIR=/usr/local/man/man1 -+MANDIR=$(PREFIX)/man/man1 - - # compiler options: - # options is a collection of: @@ -31,7 +33,7 @@ # -DDEF_ERRNO=1 Define error (not defined in errno.h). # -DMAXSEG_64K=1 -BITS=16 Support segment processsor like 80286.