diff options
| author | Pavol Rusnak <pavol@rusnak.io> | 2021-12-04 02:07:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-04 02:07:04 +0100 |
| commit | f32b60f8d6455abcb89bb9fc81e7e97f7c03869d (patch) | |
| tree | 8e3eeced9aa150e759ca6b96abd9ba59a560581f /pkgs | |
| parent | a2a684ac1385bd277bb611d60a377801f8779414 (diff) | |
| parent | de5ab3881e4868dcfa9f75723bd035ce99cb0751 (diff) | |
Merge pull request #148532 from r-burns/flashrom
flashrom: build with default gcc
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/misc/flashrom/default.nix | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix index 4c227cbe3f96a..dc42510998cdc 100644 --- a/pkgs/tools/misc/flashrom/default.nix +++ b/pkgs/tools/misc/flashrom/default.nix @@ -1,6 +1,6 @@ { fetchurl , fetchpatch -, gcc9Stdenv +, stdenv , installShellFiles , lib , libftdi1 @@ -11,7 +11,7 @@ , jlinkSupport ? false }: -gcc9Stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "flashrom"; version = "1.2"; @@ -31,6 +31,11 @@ gcc9Stdenv.mkDerivation rec { url = "https://github.com/flashrom/flashrom/commit/da6b3b70cb852dd8e9f9e21aef95fa83e7f7ab0d.patch"; sha256 = "sha256-fXYDXgT/ik+qtxxFEyJ7/axtycbwLkEg0UD+hzsYEwg="; }) + # fix build with gcc 10 + (fetchpatch { + url = "https://github.com/flashrom/flashrom/commit/3a0c1966e4c66f91e6e8551e906b6db38002acb4.patch"; + sha256 = "sha256-UfXLefMS20VUc7hk4IXECFbDWEbBnHMGSzOYemTfvjI="; + }) ]; postPatch = '' @@ -51,6 +56,6 @@ gcc9Stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ funfunctor fpletz felixsinger ]; platforms = platforms.all; - broken = gcc9Stdenv.isDarwin; # requires DirectHW + broken = stdenv.isDarwin; # requires DirectHW }; } |