Merge pull request #208564 from felixsinger/pkgs/flashrom/update
This commit is contained in:
commit
cfb0adc318
|
@ -13,31 +13,17 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flashrom";
|
||||
version = "1.2";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.flashrom.org/releases/flashrom-v${version}.tar.bz2";
|
||||
sha256 = "0ax4kqnh7kd3z120ypgp73qy1knz47l6qxsqzrfkd97mh5cdky71";
|
||||
hash = "sha256-iaf/W+sIyJuHlbvSU6UblFNUeoZMMXkzAilrVrvFbWU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config installShellFiles ];
|
||||
buildInputs = [ libftdi1 libusb1 pciutils ]
|
||||
++ lib.optional jlinkSupport libjaylink;
|
||||
|
||||
patches = [
|
||||
# remove when updating from 1.2
|
||||
(fetchpatch {
|
||||
name = "fix-aarch64-build.patch";
|
||||
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 = ''
|
||||
substituteInPlace util/z60_flashrom.rules \
|
||||
--replace "plugdev" "flashrom"
|
||||
|
|
Loading…
Reference in a new issue