Merge pull request #88099 from zowoq/fwupdate
This commit is contained in:
commit
0f5ce2fac0
|
@ -1,66 +0,0 @@
|
|||
{ efivar, fetchurl, gettext, gnu-efi, libsmbios, pkgconfig, popt, stdenv }:
|
||||
|
||||
let
|
||||
version = "12";
|
||||
|
||||
arch =
|
||||
if stdenv.hostPlatform.isx86_32
|
||||
then "ia32"
|
||||
else stdenv.hostPlatform.parsed.cpu.name;
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
pname = "fwupdate";
|
||||
inherit version;
|
||||
src = fetchurl {
|
||||
url = "https://github.com/rhinstaller/fwupdate/releases/download/${version}/fwupdate-${version}.tar.bz2";
|
||||
sha256 = "00w7jsg7wrlq4cpfz26m9rbv2jwyf0sansf343vfq02fy5lxars1";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./do-not-create-sharedstatedir.patch
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = builtins.toString [
|
||||
"-I${gnu-efi}/include/efi"
|
||||
"-I${gnu-efi}/include/efi/${arch}"
|
||||
"-Wno-error=address-of-packed-member"
|
||||
];
|
||||
|
||||
# TODO: Just apply the disable to the efi subdir
|
||||
hardeningDisable = [ "stackprotector" ];
|
||||
|
||||
makeFlags = [
|
||||
"EFIDIR=nixos"
|
||||
"prefix=$(out)"
|
||||
"LIBDIR=$(out)/lib"
|
||||
"GNUEFIDIR=${gnu-efi}/lib"
|
||||
"ESPMOUNTPOINT=$(out)/boot"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkgconfig
|
||||
gettext
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gnu-efi
|
||||
libsmbios
|
||||
popt
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
efivar
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
rm -rf $out/src
|
||||
rm -rf $out/lib/debug
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Tools for using the ESRT and UpdateCapsule() to apply firmware updates";
|
||||
maintainers = with maintainers; [ ];
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
|
@ -1,10 +0,0 @@
|
|||
--- a/linux/Makefile
|
||||
+++ b/linux/Makefile
|
||||
@@ -131,7 +131,6 @@
|
||||
ln -fs $(x) $(patsubst %.so.1.$(VERSION),%.so.1,$(DESTDIR)$(libdir)/$(x)) ;\
|
||||
ln -fs $(x) $(patsubst %.so.1.$(VERSION),%.so,$(DESTDIR)$(libdir)/$(x)) ;\
|
||||
)
|
||||
- $(INSTALL) -d -m 755 $(DESTDIR)$(sharedstatedir)/fwupdate/
|
||||
$(INSTALL) -d -m 755 $(DESTDIR)$(libexecdir)/fwupdate/
|
||||
$(INSTALL) -m 755 cleanup $(DESTDIR)$(libexecdir)/fwupdate/cleanup
|
||||
$(INSTALL) -d -m 755 $(DESTDIR)$(libdatadir)/systemd/system
|
|
@ -149,6 +149,7 @@ mapAliases ({
|
|||
fuse_exfat = exfat; # 2015-09-11
|
||||
fuseki = apache-jena-fuseki; # added 2018-04-25
|
||||
fusesmb = throw "fusesmb is abandoned by upstream"; # added 2019-10-15
|
||||
fwupdate = throw "fwupdate was merged into fwupd"; # added 2020-05-19
|
||||
gccApple = throw "gccApple is no longer supported"; # added 2018-04-25
|
||||
gdb-multitarget = gdb; # added 2017-11-13
|
||||
gdk_pixbuf = gdk-pixbuf; # added 2019-05-22
|
||||
|
|
|
@ -16523,8 +16523,6 @@ in
|
|||
|
||||
fwupd = callPackage ../os-specific/linux/firmware/fwupd { };
|
||||
|
||||
fwupdate = callPackage ../os-specific/linux/firmware/fwupdate { };
|
||||
|
||||
fwts = callPackage ../os-specific/linux/fwts { };
|
||||
|
||||
libossp_uuid = callPackage ../development/libraries/libossp-uuid { };
|
||||
|
|
Loading…
Reference in a new issue