git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #87534 from bjornfor/update-fatsort

fatsort: 1.5.0.456 -> 1.6.2.605

commit830711d302d9119dcdcd58739717c658915e2ba3 authorMario Rodas <marsam@users.noreply.github.com> dateSun 10 May 2020, 17:43 (7 years ago) parent3ecb13866f90b8
2 files changed+30−25
pkgs/tools/filesystems/fatsort/default.nix+4−2 pkgs/tools/filesystems/fatsort/fatsort-Makefiles.patch+26−23
pkgs/tools/filesystems/fatsort/default.nix+4−2
@@ -1,18 +1,20 @@
11{stdenv, fetchurl, help2man}:
22
33stdenv.mkDerivation rec {
4− version = "1.5.0.456";
4+ version = "1.6.2.605";
55 pname = "fatsort";
66
77 src = fetchurl {
88 url = "mirror://sourceforge/fatsort/${pname}-${version}.tar.xz";
9− sha256 = "15fy2m4p9s8cfvnzdcd5ynkc2js0zklkkf34sjxdac7x2iwb8dd8";
9+ sha256 = "1dzzsl3a1ampari424vxkma0i87qkbgkgm2169x9xf3az0vgmjh8";
1010 };
1111
1212 patches = [ ./fatsort-Makefiles.patch ];
1313
1414 buildInputs = [ help2man ];
1515
16+ makeFlags = [ "PREFIX=${placeholder "out"}" ];
17+
1618 meta = with stdenv.lib; {
1719 homepage = "http://fatsort.sourceforge.net/";
1820 description = "Sorts FAT partition table, for devices that don't do sorting of files";
pkgs/tools/filesystems/fatsort/fatsort-Makefiles.patch+26−23
@@ -1,31 +1,34 @@
1−diff -uNr fatsort-1.3.365-a/Makefile fatsort-1.3.365-b/Makefile
2−--- fatsort-1.3.365-a/Makefile 2014-04-08 19:19:36.000000000 +0100
3−+++ fatsort-1.3.365-b/Makefile 2014-12-14 18:31:55.982857720 +0000
1+diff -uNr fatsort-1.6.2.605.orig/Makefile fatsort-1.6.2.605.new/Makefile
2+--- fatsort-1.6.2.605.orig/Makefile 2019-11-16 16:40:27.000000000 +0100
3++++ fatsort-1.6.2.605.new/Makefile 2020-05-10 21:34:34.820874026 +0200
44@@ -1,4 +1,5 @@
55-MANDIR=/usr/local/share/man/man1
6−+PREFIX=$(out)
6++PREFIX?=/usr/local
77+MANDIR=$(PREFIX)/share/man/man1
88
99 INSTALL_FLAGS=-m 0755 -p -D
1010
11−diff -uNr fatsort-1.3.365-a/src/Makefile fatsort-1.3.365-b/src/Makefile
12−--- fatsort-1.3.365-a/src/Makefile 2014-04-08 19:19:36.000000000 +0100
13−+++ fatsort-1.3.365-b/src/Makefile 2014-12-14 18:32:08.282870461 +0000
14−@@ -1,3 +1,5 @@
15−+PREFIX=$(out)
16−+
17− CC=gcc
18− LD=gcc
19−
20−@@ -33,9 +35,9 @@
21−
22− # Mac OS X does not have a "/usr/local/sbin"
23− ifeq ($(UNAME),Darwin)
24−-SBINDIR=/usr/local/bin
25−+SBINDIR=$(PREFIX)/bin
11+diff -uNr fatsort-1.6.2.605.orig/src/Makefile fatsort-1.6.2.605.new/src/Makefile
12+--- fatsort-1.6.2.605.orig/src/Makefile 2018-11-17 00:40:59.000000000 +0100
13++++ fatsort-1.6.2.605.new/src/Makefile 2020-05-10 21:33:52.053391027 +0200
14+@@ -30,7 +30,7 @@
15+ override CFLAGS += -D __CYGWIN__
16+ override CFLAGS += -D __LINUX__
17+ override LDFLAGS += -liconv
18+- SBINDIR=/usr/local/sbin
19++ SBINDIR=$(PREFIX)/sbin
20+ endif
2621 else
27−-SBINDIR=/usr/local/sbin
28−+SBINDIR=$(PREFIX)/sbin
22+ ifdef MINGW
23+@@ -60,9 +60,9 @@
24+ # OS X's install does not support the '-D' flag.
25+ INSTALL_FLAGS=-m 0755 -p
26+ # Mac OS X does not have a "/usr/local/sbin"
27+- SBINDIR=/usr/local/bin
28++ SBINDIR=$(PREFIX)/bin
29+ else
30+- SBINDIR=/usr/local/sbin
31++ SBINDIR=$(PREFIX)/sbin
32+ endif
33+ endif
2934 endif
30−
31− 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