gptfdisk: 1.0.3 -> 1.0.4

2 files changed, 5 insertions, 27 deletions

diff --git a/pkgs/tools/system/gptfdisk/cross-makefile.patch b/pkgs/tools/system/gptfdisk/cross-makefile.patch
deleted file mode 100644
index 0b87de0a17a0..000000000000
--- a/pkgs/tools/system/gptfdisk/cross-makefile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit a5381e8aaa67647a4ba0fb41b951125ae309b078
-Author: Shea Levy <shea@shealevy.com>
-Date:   Sat Feb 24 08:35:54 2018 -0500
-
-    Makefile: Don't hard-code CC and CXX.
-    
-    These variables should be provided by the Make implementation and the
-    build environment. In particular, this fixes cross-compilation of
-    gptfdisk.
-
-diff --git a/Makefile b/Makefile
-index a3576b3..d76fab4 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,5 +1,3 @@
--CC=gcc
--CXX=g++
- CFLAGS+=-D_FILE_OFFSET_BITS=64
- #CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 -D USE_UTF16
- CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64
diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix
index 4d7bcc365660..4a3c895c3b93 100644
--- a/pkgs/tools/system/gptfdisk/default.nix
+++ b/pkgs/tools/system/gptfdisk/default.nix
@@ -2,18 +2,16 @@
 
 stdenv.mkDerivation rec {
   name = "gptfdisk-${version}";
-  version = "1.0.3";
+  version = "1.0.4";
 
   src = fetchurl {
-    # http://www.rodsbooks.com/gdisk/${name}.tar.gz also works, but the home
+    # https://www.rodsbooks.com/gdisk/${name}.tar.gz also works, but the home
     # page clearly implies a preference for using SourceForge's bandwidth:
     url = "mirror://sourceforge/gptfdisk/${name}.tar.gz";
-    sha256 = "0p0vr67lnqdsgdv2y144xmjqa1a2nijrrd3clc8dc2f46pn5mzc9";
+    sha256 = "13d7gff4prl1nsdknjigmb7bbqhn79165n01v4y9mwbnd0d3jqxn";
   };
-  # https://sourceforge.net/p/gptfdisk/code/merge-requests/9/
-  patches = [ ./cross-makefile.patch ];
 
-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
     substituteInPlace Makefile.mac --replace \
       "-mmacosx-version-min=10.4" "-mmacosx-version-min=10.6"
     substituteInPlace Makefile.mac --replace \
@@ -40,7 +38,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Set of text-mode partitioning tools for Globally Unique Identifier (GUID) Partition Table (GPT) disks";
     license = licenses.gpl2;
-    homepage = http://www.rodsbooks.com/gdisk/;
+    homepage = https://www.rodsbooks.com/gdisk/;
     platforms = platforms.all;
   };
 }