Merge pull request #36821 from jfrankenau/update-f3

f3: 6.0-2016.11.16-unstable -> 7.0
This commit is contained in:
Matthew Justin Bauer 2018-04-09 14:08:27 -05:00 committed by GitHub
commit cc5c927aea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,27 +1,26 @@
{ stdenv, fetchFromGitHub { stdenv, fetchFromGitHub
, parted, udev , parted, udev
}: }:
let
version = "6.0-2016.11.16-unstable";
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "f3-${version}"; name = "${pname}-${version}";
pname = "f3";
version = "7.0";
enableParallelBuilding = true; enableParallelBuilding = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "AltraMayor"; owner = "AltraMayor";
repo = "f3"; repo = pname;
rev = "eabf001f69a788e64912bc9e812c118a324077d5"; rev = "v${version}";
sha256 = "0ypqyqwqiy3ynssdd9gamk1jxywg6avb45ndlzhv3wxh2qcframm"; sha256 = "195j2zd747ffbsl8p5rf7dyn1j5n05zfqy1s9fm4y6lz8yc1nr17";
}; };
buildInputs = [ parted udev ]; buildInputs = [ parted udev ];
patchPhase = "sed -i 's/-oroot -groot//' Makefile"; patchPhase = "sed -i 's/-oroot -groot//' Makefile";
buildFlags = [ "CFLAGS=-fgnu89-inline" # HACK for weird gcc incompatibility with -O2 buildFlags = [ "all" # f3read, f3write
"all" # f3read, f3write
"extra" # f3brew, f3fix, f3probe "extra" # f3brew, f3fix, f3probe
]; ];