public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gptfdisk: 1.0.3 -> 1.0.4

Browse Source
This commit is contained in:
Vladyslav Mykhailichenko 2018-07-22 10:33:05 +03:00 committed by Franz Pletz
parent 5210a073ad
commit 2c8e87634f
2 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/tools/system/gptfdisk/cross-makefile.patch
View File

@ -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

12
pkgs/tools/system/gptfdisk/default.nix
View File

@ -2,18 +2,16 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gptfdisk-${version}"; name = "gptfdisk-${version}";
version = "1.0.3"; version = "1.0.4";
src = fetchurl { 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: # page clearly implies a preference for using SourceForge's bandwidth:
url = "mirror://sourceforge/gptfdisk/${name}.tar.gz"; 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 \ substituteInPlace Makefile.mac --replace \
"-mmacosx-version-min=10.4" "-mmacosx-version-min=10.6" "-mmacosx-version-min=10.4" "-mmacosx-version-min=10.6"
substituteInPlace Makefile.mac --replace \ substituteInPlace Makefile.mac --replace \
@ -40,7 +38,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Set of text-mode partitioning tools for Globally Unique Identifier (GUID) Partition Table (GPT) disks"; description = "Set of text-mode partitioning tools for Globally Unique Identifier (GUID) Partition Table (GPT) disks";
license = licenses.gpl2; license = licenses.gpl2;
homepage = http://www.rodsbooks.com/gdisk/; homepage = https://www.rodsbooks.com/gdisk/;
platforms = platforms.all; platforms = platforms.all;
}; };
} }