Merge pull request #20724 from elitak/f3

f3: newer git rev, build extra binaries

authored by Jörg Thalheim and committed by GitHub 03d3531f 5d5346d8

+20 -6
+20 -6
pkgs/tools/filesystems/f3/default.nix
··· 1 - { stdenv, fetchFromGitHub }: 2 - 3 stdenv.mkDerivation rec { 4 name = "f3-${version}"; 5 - version = "6.0"; 6 7 enableParallelBuilding = true; 8 9 src = fetchFromGitHub { 10 owner = "AltraMayor"; 11 repo = "f3"; 12 - rev = "v${version}"; 13 - sha256 = "1azi10ba0h9z7m0gmfnyymmfqb8380k9za8hn1rrw1s442hzgnz2"; 14 }; 15 16 - makeFlags = [ "PREFIX=$(out)" ]; 17 patchPhase = "sed -i 's/-oroot -groot//' Makefile"; 18 19 meta = { 20 description = "Fight Flash Fraud";
··· 1 + { stdenv, fetchFromGitHub 2 + , parted, udev 3 + }: 4 + let 5 + version = "unstable-2016-11-26"; 6 + in 7 stdenv.mkDerivation rec { 8 name = "f3-${version}"; 9 10 enableParallelBuilding = true; 11 12 src = fetchFromGitHub { 13 owner = "AltraMayor"; 14 repo = "f3"; 15 + rev = "eabf001f69a788e64912bc9e812c118a324077d5"; 16 + sha256 = "0ypqyqwqiy3ynssdd9gamk1jxywg6avb45ndlzhv3wxh2qcframm"; 17 }; 18 19 + buildInputs = [ parted udev ]; 20 + 21 patchPhase = "sed -i 's/-oroot -groot//' Makefile"; 22 + 23 + buildFlags = [ "CFLAGS=-fgnu89-inline" # HACK for weird gcc incompatibility with -O2 24 + "all" # f3read, f3write 25 + "extra" # f3brew, f3fix, f3probe 26 + ]; 27 + 28 + installFlags = [ "PREFIX=$(out)" 29 + "install" 30 + "install-extra" 31 + ]; 32 33 meta = { 34 description = "Fight Flash Fraud";