flashrom: build with default gcc
Fetch upstream patch to fix build with gcc 10
This commit is contained in:
parent
fd481c684c
commit
de5ab3881e
@ -1,6 +1,6 @@
|
|||||||
{ fetchurl
|
{ fetchurl
|
||||||
, fetchpatch
|
, fetchpatch
|
||||||
, gcc9Stdenv
|
, stdenv
|
||||||
, installShellFiles
|
, installShellFiles
|
||||||
, lib
|
, lib
|
||||||
, libftdi1
|
, libftdi1
|
||||||
@ -11,7 +11,7 @@
|
|||||||
, jlinkSupport ? false
|
, jlinkSupport ? false
|
||||||
}:
|
}:
|
||||||
|
|
||||||
gcc9Stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "flashrom";
|
pname = "flashrom";
|
||||||
version = "1.2";
|
version = "1.2";
|
||||||
|
|
||||||
@ -31,6 +31,11 @@ gcc9Stdenv.mkDerivation rec {
|
|||||||
url = "https://github.com/flashrom/flashrom/commit/da6b3b70cb852dd8e9f9e21aef95fa83e7f7ab0d.patch";
|
url = "https://github.com/flashrom/flashrom/commit/da6b3b70cb852dd8e9f9e21aef95fa83e7f7ab0d.patch";
|
||||||
sha256 = "sha256-fXYDXgT/ik+qtxxFEyJ7/axtycbwLkEg0UD+hzsYEwg=";
|
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 = ''
|
postPatch = ''
|
||||||
@ -51,6 +56,6 @@ gcc9Stdenv.mkDerivation rec {
|
|||||||
license = licenses.gpl2;
|
license = licenses.gpl2;
|
||||||
maintainers = with maintainers; [ funfunctor fpletz felixsinger ];
|
maintainers = with maintainers; [ funfunctor fpletz felixsinger ];
|
||||||
platforms = platforms.all;
|
platforms = platforms.all;
|
||||||
broken = gcc9Stdenv.isDarwin; # requires DirectHW
|
broken = stdenv.isDarwin; # requires DirectHW
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user