diff options
| author | lethalman <lucabru@src.gnome.org> | 2014-12-19 10:23:13 +0100 |
|---|---|---|
| committer | lethalman <lucabru@src.gnome.org> | 2014-12-19 10:23:13 +0100 |
| commit | 70bede51a2f3eae0dcb128550b07aa704b3a91c5 (patch) | |
| tree | 1c6d7c494f0e8ecd6635a2d6fcd2c53c5f16b817 | |
| parent | 5ff1f172487461e0bbae2b92d94c94d7154a093f (diff) | |
| parent | 6f608967f441dba26dec55cbd005ebe5c7724f54 (diff) | |
Merge pull request #5370 from KoviRobi/master
Added package 'fatsort'.
| -rw-r--r-- | lib/maintainers.nix | 1 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/fatsort/default.nix | 20 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/fatsort/fatsort-Makefiles.patch | 31 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 54 insertions, 0 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix index cdb0c3ef3afb..a378e7dc287c 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -91,6 +91,7 @@ jzellner = "Jeff Zellner <jeffz@eml.cc>"; kkallio = "Karn Kallio <tierpluspluslists@gmail.com>"; koral = "Koral <koral@mailoo.org>"; + kovirobi = "Kovacsics Robert <kovirobi@gmail.com>"; kragniz = "Louis Taylor <kragniz@gmail.com>"; ktosiek = "Tomasz Kontusz <tomasz.kontusz@gmail.com>"; lethalman = "Luca Bruno <lucabru@src.gnome.org>"; diff --git a/pkgs/tools/filesystems/fatsort/default.nix b/pkgs/tools/filesystems/fatsort/default.nix new file mode 100644 index 000000000000..3e483a293649 --- /dev/null +++ b/pkgs/tools/filesystems/fatsort/default.nix @@ -0,0 +1,20 @@ +{stdenv, fetchurl, help2man}: + +stdenv.mkDerivation { + name = "fatsort"; + src = fetchurl { + url = mirror://sourceforge/fatsort/fatsort-1.3.365.tar.gz; + sha256 = "0g9zn2ns86g7zmy0y8hw1w1zhnd51hy8yl6kflyhxs49n5sc7b3p"; + }; + + patches = [ ./fatsort-Makefiles.patch ]; + + buildInputs = [ help2man ]; + + meta = { + homepage = http://fatsort.sourceforge.net/; + description = "Sorts FAT partition table, for devices that don't do sorting of files."; + maintainers = [ stdenv.lib.maintainers.kovirobi ]; + license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/pkgs/tools/filesystems/fatsort/fatsort-Makefiles.patch b/pkgs/tools/filesystems/fatsort/fatsort-Makefiles.patch new file mode 100644 index 000000000000..9c9f58e97ab4 --- /dev/null +++ b/pkgs/tools/filesystems/fatsort/fatsort-Makefiles.patch @@ -0,0 +1,31 @@ +diff -uNr fatsort-1.3.365-a/Makefile fatsort-1.3.365-b/Makefile +--- fatsort-1.3.365-a/Makefile 2014-04-08 19:19:36.000000000 +0100 ++++ fatsort-1.3.365-b/Makefile 2014-12-14 18:31:55.982857720 +0000 +@@ -1,4 +1,5 @@ +-MANDIR=/usr/local/share/man/man1 ++PREFIX=$(out) ++MANDIR=$(PREFIX)/share/man/man1 + + INSTALL_FLAGS=-m 0755 -p -D + +diff -uNr fatsort-1.3.365-a/src/Makefile fatsort-1.3.365-b/src/Makefile +--- fatsort-1.3.365-a/src/Makefile 2014-04-08 19:19:36.000000000 +0100 ++++ fatsort-1.3.365-b/src/Makefile 2014-12-14 18:32:08.282870461 +0000 +@@ -1,3 +1,5 @@ ++PREFIX=$(out) ++ + CC=gcc + LD=gcc + +@@ -33,9 +35,9 @@ + + # Mac OS X does not have a "/usr/local/sbin" + ifeq ($(UNAME),Darwin) +-SBINDIR=/usr/local/bin ++SBINDIR=$(PREFIX)/bin + else +-SBINDIR=/usr/local/sbin ++SBINDIR=$(PREFIX)/sbin + 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0dcaaceed16d..6ced6c34bc57 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1145,6 +1145,8 @@ let fakechroot = callPackage ../tools/system/fakechroot { }; + fatsort = callPackage ../tools/filesystems/fatsort { }; + fatrace = callPackage ../os-specific/linux/fatrace { }; fcitx = callPackage ../tools/inputmethods/fcitx { }; |