diff options
| author | Jörg Thalheim <joerg@higgsboson.tk> | 2016-11-27 13:15:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-27 13:15:44 +0100 |
| commit | 03d3531fb39e5020483d76753661a93f22d8d19e (patch) | |
| tree | da42cf689f5ce8278c739f3b08620808eb4971af /pkgs/tools | |
| parent | 5d5346d824fdf19d5ac879bb4c98e6381d41c76d (diff) | |
| parent | c4650769f53cd61ad2c0127e1de4d3278d85f562 (diff) | |
| download | nixpkgs-03d3531fb39e5020483d76753661a93f22d8d19e.tar nixpkgs-03d3531fb39e5020483d76753661a93f22d8d19e.tar.gz nixpkgs-03d3531fb39e5020483d76753661a93f22d8d19e.tar.bz2 nixpkgs-03d3531fb39e5020483d76753661a93f22d8d19e.tar.lz nixpkgs-03d3531fb39e5020483d76753661a93f22d8d19e.tar.xz nixpkgs-03d3531fb39e5020483d76753661a93f22d8d19e.tar.zst nixpkgs-03d3531fb39e5020483d76753661a93f22d8d19e.zip | |
Merge pull request #20724 from elitak/f3
f3: newer git rev, build extra binaries
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/filesystems/f3/default.nix | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/pkgs/tools/filesystems/f3/default.nix b/pkgs/tools/filesystems/f3/default.nix index e7f20b1e6b3..0ea8b1b8986 100644 --- a/pkgs/tools/filesystems/f3/default.nix +++ b/pkgs/tools/filesystems/f3/default.nix @@ -1,21 +1,35 @@ -{ stdenv, fetchFromGitHub }: - +{ stdenv, fetchFromGitHub +, parted, udev +}: +let + version = "unstable-2016-11-26"; +in stdenv.mkDerivation rec { name = "f3-${version}"; - version = "6.0"; enableParallelBuilding = true; src = fetchFromGitHub { owner = "AltraMayor"; repo = "f3"; - rev = "v${version}"; - sha256 = "1azi10ba0h9z7m0gmfnyymmfqb8380k9za8hn1rrw1s442hzgnz2"; + rev = "eabf001f69a788e64912bc9e812c118a324077d5"; + sha256 = "0ypqyqwqiy3ynssdd9gamk1jxywg6avb45ndlzhv3wxh2qcframm"; }; - makeFlags = [ "PREFIX=$(out)" ]; + buildInputs = [ parted udev ]; + patchPhase = "sed -i 's/-oroot -groot//' Makefile"; + buildFlags = [ "CFLAGS=-fgnu89-inline" # HACK for weird gcc incompatibility with -O2 + "all" # f3read, f3write + "extra" # f3brew, f3fix, f3probe + ]; + + installFlags = [ "PREFIX=$(out)" + "install" + "install-extra" + ]; + meta = { description = "Fight Flash Fraud"; homepage = http://oss.digirati.com.br/f3/; |