diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
commit | 99fcaeccb89621dd492203ce1f2d551c06f228ed (patch) | |
tree | 41cb730ae07383004789779b0f6e11cb3f4642a3 /nixpkgs/pkgs/tools/filesystems/f3 | |
parent | 59c5f5ac8682acc13bb22bc29c7cf02f7d75f01f (diff) | |
parent | 75a5ebf473cd60148ba9aec0d219f72e5cf52519 (diff) | |
download | nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.gz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.bz2 nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.lz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.xz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.zst nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/config/console.nix nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix nixpkgs/pkgs/applications/networking/irc/weechat/default.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/interpreters/python/default.nix nixpkgs/pkgs/development/node-packages/overrides.nix nixpkgs/pkgs/development/tools/b4/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix nixpkgs/pkgs/servers/mail/public-inbox/default.nix nixpkgs/pkgs/tools/security/pinentry/default.nix nixpkgs/pkgs/tools/text/unoconv/default.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/tools/filesystems/f3')
-rw-r--r-- | nixpkgs/pkgs/tools/filesystems/f3/default.nix | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/nixpkgs/pkgs/tools/filesystems/f3/default.nix b/nixpkgs/pkgs/tools/filesystems/f3/default.nix index b9817ecb05c0..ebdedd5b4aa3 100644 --- a/nixpkgs/pkgs/tools/filesystems/f3/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/f3/default.nix @@ -1,5 +1,9 @@ -{ stdenv, lib, fetchFromGitHub -, parted, systemd ? null +{ stdenv +, lib +, fetchFromGitHub +, parted +, systemd +, argp-standalone }: stdenv.mkDerivation rec { @@ -14,22 +18,18 @@ stdenv.mkDerivation rec { }; postPatch = '' - sed -i 's/-oroot -groot//' Makefile + sed -i 's/-oroot -groot//' Makefile - for f in f3write.h2w log-f3wr; do - substituteInPlace $f \ - --replace '$(dirname $0)' $out/bin - done + for f in f3write.h2w log-f3wr; do + substituteInPlace $f \ + --replace '$(dirname $0)' $out/bin + done ''; - buildInputs = [ - parted - ] - ++ lib.optional stdenv.isLinux systemd; - - enableParallelBuilding = true; + buildInputs = lib.optionals stdenv.isLinux [ systemd parted ] + ++ lib.optionals stdenv.isDarwin [ argp-standalone ]; - buildFlags = [ + buildFlags = [ "all" # f3read, f3write ] ++ lib.optional stdenv.isLinux "extra"; # f3brew, f3fix, f3probe @@ -50,8 +50,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fight Flash Fraud"; - homepage = "http://oss.digirati.com.br/f3/"; + homepage = "https://fight-flash-fraud.readthedocs.io/en/stable/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ makefu ]; + maintainers = with maintainers; [ makefu evils ]; }; } |