suzanne.soy/nixpkgs
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

fatsort: 1.5.0.456 -> 1.6.2.605

Browse Source 
The patch to set PREFIX needed updating to apply. Rewrite it in a way
that allows submitting upstream. That means we don't hardcode
PREFIX=$out inside the patch but allow the PREFIX to be passed to make
at build time.
This commit is contained in:
Bjørn Forsman 2020-05-10 21:36:32 +02:00
parent 5da1393030
commit 66f90b84b8
2 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/filesystems/fatsort/default.nix
View File

@ -1,18 +1,20 @@
{stdenv, fetchurl, help2man}: {stdenv, fetchurl, help2man}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.5.0.456"; version = "1.6.2.605";
pname = "fatsort"; pname = "fatsort";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/fatsort/${pname}-${version}.tar.xz"; url = "mirror://sourceforge/fatsort/${pname}-${version}.tar.xz";
sha256 = "15fy2m4p9s8cfvnzdcd5ynkc2js0zklkkf34sjxdac7x2iwb8dd8"; sha256 = "1dzzsl3a1ampari424vxkma0i87qkbgkgm2169x9xf3az0vgmjh8";
}; };
patches = [ ./fatsort-Makefiles.patch ]; patches = [ ./fatsort-Makefiles.patch ];
buildInputs = [ help2man ]; buildInputs = [ help2man ];
makeFlags = [ "PREFIX=${placeholder "out"}" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "http://fatsort.sourceforge.net/"; homepage = "http://fatsort.sourceforge.net/";
description = "Sorts FAT partition table, for devices that don't do sorting of files"; description = "Sorts FAT partition table, for devices that don't do sorting of files";

39
pkgs/tools/filesystems/fatsort/fatsort-Makefiles.patch
View File

@ -1,31 +1,34 @@
diff -uNr fatsort-1.3.365-a/Makefile fatsort-1.3.365-b/Makefile diff -uNr fatsort-1.6.2.605.orig/Makefile fatsort-1.6.2.605.new/Makefile
--- fatsort-1.3.365-a/Makefile 2014-04-08 19:19:36.000000000 +0100 --- fatsort-1.6.2.605.orig/Makefile 2019-11-16 16:40:27.000000000 +0100
+++ fatsort-1.3.365-b/Makefile 2014-12-14 18:31:55.982857720 +0000 +++ fatsort-1.6.2.605.new/Makefile 2020-05-10 21:34:34.820874026 +0200
@@ -1,4 +1,5 @@ @@ -1,4 +1,5 @@
-MANDIR=/usr/local/share/man/man1 -MANDIR=/usr/local/share/man/man1
+PREFIX=$(out) +PREFIX?=/usr/local
+MANDIR=$(PREFIX)/share/man/man1 +MANDIR=$(PREFIX)/share/man/man1
INSTALL_FLAGS=-m 0755 -p -D INSTALL_FLAGS=-m 0755 -p -D
diff -uNr fatsort-1.3.365-a/src/Makefile fatsort-1.3.365-b/src/Makefile diff -uNr fatsort-1.6.2.605.orig/src/Makefile fatsort-1.6.2.605.new/src/Makefile
--- fatsort-1.3.365-a/src/Makefile 2014-04-08 19:19:36.000000000 +0100 --- fatsort-1.6.2.605.orig/src/Makefile 2018-11-17 00:40:59.000000000 +0100
+++ fatsort-1.3.365-b/src/Makefile 2014-12-14 18:32:08.282870461 +0000 +++ fatsort-1.6.2.605.new/src/Makefile 2020-05-10 21:33:52.053391027 +0200
@@ -1,3 +1,5 @@ @@ -30,7 +30,7 @@
+PREFIX=$(out) override CFLAGS += -D __CYGWIN__
+ override CFLAGS += -D __LINUX__
CC=gcc override LDFLAGS += -liconv
LD=gcc - SBINDIR=/usr/local/sbin
+ SBINDIR=$(PREFIX)/sbin
@@ -33,9 +35,9 @@ endif
else
ifdef MINGW
@@ -60,9 +60,9 @@
# OS X's install does not support the '-D' flag.
INSTALL_FLAGS=-m 0755 -p
# Mac OS X does not have a "/usr/local/sbin" # Mac OS X does not have a "/usr/local/sbin"
ifeq ($(UNAME),Darwin)
- SBINDIR=/usr/local/bin - SBINDIR=/usr/local/bin
+ SBINDIR=$(PREFIX)/bin + SBINDIR=$(PREFIX)/bin
else else
- SBINDIR=/usr/local/sbin - SBINDIR=/usr/local/sbin
+ SBINDIR=$(PREFIX)/sbin + SBINDIR=$(PREFIX)/sbin
endif endif
endif
OBJ=fatsort.o FAT_fs.o fileio.o endianness.o signal.o entrylist.o errors.o options.o clusterchain.o sort.o misc.o natstrcmp.o stringlist.o endif