diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-05-19 01:31:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-19 01:31:20 +0200 |
| commit | 0f5ce2fac0c726036ca69a5524c59a49e2973dd4 (patch) | |
| tree | 63ab7187d87bcc9c4c3faea5550273d22995d961 /pkgs/os-specific | |
| parent | 69711a2f5ffe8cda208163be5258266172ff527f (diff) | |
| parent | a5cbd4fa354b3f6d7bf07a031baedbbb3712ef4a (diff) | |
| download | nixlib-0f5ce2fac0c726036ca69a5524c59a49e2973dd4.tar nixlib-0f5ce2fac0c726036ca69a5524c59a49e2973dd4.tar.gz nixlib-0f5ce2fac0c726036ca69a5524c59a49e2973dd4.tar.bz2 nixlib-0f5ce2fac0c726036ca69a5524c59a49e2973dd4.tar.lz nixlib-0f5ce2fac0c726036ca69a5524c59a49e2973dd4.tar.xz nixlib-0f5ce2fac0c726036ca69a5524c59a49e2973dd4.tar.zst nixlib-0f5ce2fac0c726036ca69a5524c59a49e2973dd4.zip | |
Merge pull request #88099 from zowoq/fwupdate
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/firmware/fwupdate/default.nix | 66 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/firmware/fwupdate/do-not-create-sharedstatedir.patch | 10 |
2 files changed, 0 insertions, 76 deletions
diff --git a/pkgs/os-specific/linux/firmware/fwupdate/default.nix b/pkgs/os-specific/linux/firmware/fwupdate/default.nix deleted file mode 100644 index bcafa7f3376d..000000000000 --- a/pkgs/os-specific/linux/firmware/fwupdate/default.nix +++ /dev/null @@ -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; - }; -} diff --git a/pkgs/os-specific/linux/firmware/fwupdate/do-not-create-sharedstatedir.patch b/pkgs/os-specific/linux/firmware/fwupdate/do-not-create-sharedstatedir.patch deleted file mode 100644 index b8588ef2b11a..000000000000 --- a/pkgs/os-specific/linux/firmware/fwupdate/do-not-create-sharedstatedir.patch +++ /dev/null @@ -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 |