commit 3b512ca185edb4f2462000d5ee9b0eb72425db24 · pyrox.dev/nixpkgs

+1 -5

nixos/modules/services/hardware/fwupd.nix

···

       8
        
         cfg = config.services.fwupd;

     

       9
        
         originalEtc =

     

       10
        
           let

     

       11
       -
             isRegular = v: v == "regular";

     

       12
       -
             listFiles = d: builtins.attrNames (filterAttrs (const isRegular) (builtins.readDir d));

     

       13
       -
             copiedDirs = [ "fwupd/remotes.d" "pki/fwupd" "pki/fwupd-metadata" ];

     

       14
       -
             originalFiles = concatMap (d: map (f: "${d}/${f}") (listFiles "${pkgs.fwupd}/etc/${d}")) copiedDirs;

     

       15
        
             mkEtcFile = n: nameValuePair n { source = "${pkgs.fwupd}/etc/${n}"; };

     

       16
       -
           in listToAttrs (map mkEtcFile originalFiles);

     

       17
        
         extraTrustedKeys =

     

       18
        
           let

     

       19
        
             mkName = p: "pki/fwupd/${baseNameOf (toString p)}";

···

       8
        
         cfg = config.services.fwupd;

     

       9
        
         originalEtc =

     

       10
        
           let

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       11
        
             mkEtcFile = n: nameValuePair n { source = "${pkgs.fwupd}/etc/${n}"; };

     

       12
       +
           in listToAttrs (map mkEtcFile pkgs.fwupd.filesInstalledToEtc);

     

       13
        
         extraTrustedKeys =

     

       14
        
           let

     

       15
        
             mkName = p: "pki/fwupd/${baseNameOf (toString p)}";

+1 -1

nixos/release.nix

···

       258
        
         tests.firefox = callTest tests/firefox.nix {};

     

       259
        
         tests.firewall = callTest tests/firewall.nix {};

     

       260
        
         tests.fleet = callTestOnTheseSystems ["x86_64-linux"] tests/fleet.nix {};

     

       261
       -
         #tests.fwupd = callTest tests/fwupd.nix {}; # build during evaluation

     

       262
        
         #tests.gitlab = callTest tests/gitlab.nix {};

     

       263
        
         tests.gitolite = callTest tests/gitolite.nix {};

     

       264
        
         tests.gjs = callTest tests/gjs.nix {};

···

       258
        
         tests.firefox = callTest tests/firefox.nix {};

     

       259
        
         tests.firewall = callTest tests/firewall.nix {};

     

       260
        
         tests.fleet = callTestOnTheseSystems ["x86_64-linux"] tests/fleet.nix {};

     

       261
       +
         tests.fwupd = callTest tests/fwupd.nix {};

     

       262
        
         #tests.gitlab = callTest tests/gitlab.nix {};

     

       263
        
         tests.gitolite = callTest tests/gitolite.nix {};

     

       264
        
         tests.gjs = callTest tests/gjs.nix {};

+8 -12

pkgs/development/libraries/umockdev/default.nix

···

       1
       -
       { stdenv, fetchFromGitHub, autoreconfHook

     

       2
       -
       , pkgconfig, glib, systemd, libgudev, vala  }:

     

       3
        
       

     

       4
        
       stdenv.mkDerivation rec {

     

       5
       -
         name = "umockdev";

     

       6
       -
         version = "0.8.13";

     

       7
        
       

     

       8
        
         src = fetchFromGitHub {

     

       9
        
           owner = "martinpitt";

     

       10
        
           repo = "umockdev";

     

       11
        
           rev = version;

     

       12
       -
           sha256 ="0bw2dpshlgbdwg5mhq4j22z474llpqix8pxii63r2bk5nhjc537k";

     

       13
        
         };

     

       14
        
       

     

       15
       -
         buildInputs = [ glib systemd libgudev vala ];

     

       16
       -
         nativeBuildInputs = [ autoreconfHook pkgconfig ];

     

       17
        
       

     

       18
       -
         ### docs/gtk-doc.make not found

     

       19
       -
         prePatch = ''

     

       20
       -
           sed -i 's|include $(top_srcdir)/docs/gtk-doc.make||g' docs/reference/Makefile.am

     

       21
       -
          sed -i 's|+=|=|g' docs/reference/Makefile.am

     

       22
       -
          '';

     

       23
        
       

     

       24
        
         meta = with stdenv.lib; {

     

       25
        
           description = "Mock hardware devices for creating unit tests";

···

       1
       +
       { stdenv, fetchFromGitHub, automake, autoconf, libtool, gtk_doc

     

       2
       +
       , pkgconfig, glib, systemd, libgudev, vala }:

     

       3
        
       

     

       4
        
       stdenv.mkDerivation rec {

     

       5
       +
         name = "umockdev-${version}";

     

       6
       +
         version = "0.11";

     

       7
        
       

     

       8
        
         src = fetchFromGitHub {

     

       9
        
           owner = "martinpitt";

     

       10
        
           repo = "umockdev";

     

       11
        
           rev = version;

     

       12
       +
           sha256 ="1gpk2f03nad4qv084hx7549d68cqc1xibxm0ncanafm5xjz1hp55";

     

       13
        
         };

     

       14
        
       

     

       15
       +
         buildInputs = [ glib systemd libgudev ];

     

       16
       +
         nativeBuildInputs = [ automake autoconf libtool gtk_doc pkgconfig vala ];

     

       17
        
       

     

       18
       +
         preConfigure = "NOCONFIGURE=1 ./autogen.sh";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       19
        
       

     

       20
        
         meta = with stdenv.lib; {

     

       21
        
           description = "Mock hardware devices for creating unit tests";

+19 -16

pkgs/os-specific/linux/firmware/fwupd/default.nix

···

       6
        
       , shared_mime_info, umockdev

     

       7
        
       }:

     

       8
        
       let

     

       9
       -
         version = "1.0.4";

     

       0
        
       
     

       10
        
         python = python3.withPackages (p: with p; [ pygobject3 pycairo pillow ]);

     

       11
        
         installedTestsPython = python3.withPackages (p: with p; [ pygobject3 requests ]);

     

       12
        
       in stdenv.mkDerivation {

     

       13
        
         name = "fwupd-${version}";

     

       14
        
         src = fetchurl {

     

       15
        
           url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";

     

       16
       -
           sha256 = "1n4d6fw3ffg051072hbxn106s52x2wlh5dh2kxwdfjsb5kh03ra3";

     

       17
        
         };

     

       18
        
       

     

       19
        
         outputs = [ "out" "devdoc" "man" "installedTests" ];

     
···

       31
        
       

     

       32
        
         patches = [

     

       33
        
           ./fix-missing-deps.patch

     

       34
       -
           # https://github.com/hughsie/fwupd/issues/403

     

       35
        
           (fetchpatch {

     

       36
       -
             url = https://github.com/hughsie/fwupd/commit/bd6082574989e4f48b66c7270bb408d439b77a06.patch;

     

       37
       -
             sha256 = "17pixyizkmn6wlsjmr1wwya17ivn770hdv9mp769vifxinya8w9y";

     

       38
       -
           })

     

       39
       -
           # drop docbook2man

     

       40
       -
           (fetchpatch {

     

       41
       -
             url = https://github.com/hughsie/fwupd/commit/2c43d3e6e65868b66a9a64a76123697e259ec7c2.patch;

     

       42
       -
             sha256 = "0vjv7jnai0g96frlipk2sc59pj3mhq9di01hajycjv7y5v6qqrmc";

     

       43
       -
           })

     

       44
       -
           # https://github.com/hughsie/fwupd/issues/405

     

       45
       -
           (fetchpatch {

     

       46
       -
             url = https://github.com/hughsie/fwupd/pull/407.patch;

     

       47
       -
             sha256 = "1dxhqps12x7bz0s974xk5hfpk4nwn1gs29vl0dfi9j54wy18f688";

     

       48
        
           })

     

       49
        
         ];

     

       50
        
       

     
···

       77
        
             --prefix GI_TYPELIB_PATH : "$out/lib/girepository-1.0:${libsoup}/lib/girepository-1.0"

     

       78
        
         '';

     

       79
        
       

     

       80
       -
         enableParallelBuilding = true;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       81
        
         meta = with stdenv.lib; {

     

       82
        
           homepage = https://fwupd.org/;

     

       83
        
           maintainers = with maintainers; [];

···

       6
        
       , shared_mime_info, umockdev

     

       7
        
       }:

     

       8
        
       let

     

       9
       +
         # Updating? Keep $out/etc synchronized with passthru.filesInstalledToEtc

     

       10
       +
         version = "1.0.5";

     

       11
        
         python = python3.withPackages (p: with p; [ pygobject3 pycairo pillow ]);

     

       12
        
         installedTestsPython = python3.withPackages (p: with p; [ pygobject3 requests ]);

     

       13
        
       in stdenv.mkDerivation {

     

       14
        
         name = "fwupd-${version}";

     

       15
        
         src = fetchurl {

     

       16
        
           url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";

     

       17
       +
           sha256 = "0wm195vkf6x1kg1dz0sbfwpdcn9f6638l7vyzplcfrb3v07pqxpq";

     

       18
        
         };

     

       19
        
       

     

       20
        
         outputs = [ "out" "devdoc" "man" "installedTests" ];

     
···

       32
        
       

     

       33
        
         patches = [

     

       34
        
           ./fix-missing-deps.patch

     

       0
        
       
     

       35
        
           (fetchpatch {

     

       36
       +
             url = https://github.com/hughsie/fwupd/commit/767210e4b1401d5d5bb7ac1e7c052a60b6529d88.patch;

     

       37
       +
             sha256 = "00adfabxpgdg74jx7i6jihhh8njjk2r7v3fxqs4scj3vn06k5fmw";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       38
        
           })

     

       39
        
         ];

     

       40
        
       

     
···

       67
        
             --prefix GI_TYPELIB_PATH : "$out/lib/girepository-1.0:${libsoup}/lib/girepository-1.0"

     

       68
        
         '';

     

       69
        
       

     

       70
       +
         passthru = {

     

       71
       +
           filesInstalledToEtc = [

     

       72
       +
             "fwupd/remotes.d/fwupd.conf"

     

       73
       +
             "fwupd/remotes.d/lvfs-testing.conf"

     

       74
       +
             "fwupd/remotes.d/lvfs.conf"

     

       75
       +
             "fwupd/remotes.d/vendor.conf"

     

       76
       +
             "pki/fwupd/GPG-KEY-Hughski-Limited"

     

       77
       +
             "pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service"

     

       78
       +
             "pki/fwupd/LVFS-CA.pem"

     

       79
       +
             "pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service"

     

       80
       +
             "pki/fwupd-metadata/LVFS-CA.pem"

     

       81
       +
           ];

     

       82
       +
         };

     

       83
       +
       

     

       84
        
         meta = with stdenv.lib; {

     

       85
        
           homepage = https://fwupd.org/;

     

       86
        
           maintainers = with maintainers; [];

+62 -37

pkgs/os-specific/linux/firmware/fwupdate/default.nix

···

       1
       -
       { stdenv, fetchurl, gnu-efi, efivar, libsmbios, popt, pkgconfig

     

       2
       -
       , gettext }:

     

       3
       -
       let version = "8"; in

     

       4
       -
         stdenv.mkDerivation

     

       5
       -
           { name = "fwupdate-${version}";

     

       6
       -
             src = fetchurl

     

       7
       -
               { url = "https://github.com/rhinstaller/fwupdate/releases/download/${version}/fwupdate-${version}.tar.bz2";

     

       8
       -
                 sha256 = "10q8k1kghvbcb5fwcl2smzp8vqdfzimx9dkk0c3hz39py1phy4n8";

     

       9
       -
               };

     

       10
       -
             makeFlags =

     

       11
       -
               [ "EFIDIR=nixos"

     

       12
       -
                 "LIBDIR=$(out)/lib"

     

       13
       -
                 "GNUEFIDIR=${gnu-efi}/lib"

     

       14
       -
                 "TARGETDIR=$(out)/boot/efi/nixos/"

     

       15
       -
                 "prefix=$(out)/"

     

       16
       -
               ];

     

       17
       -
         nativeBuildInputs = [ pkgconfig ];

     

       18
       -
             buildInputs = [ gnu-efi libsmbios popt gettext ];

     

       19
       -
             propagatedBuildInputs = [ efivar ];

     

       20
       -
             # TODO: Just apply the disable to the efi subdir

     

       21
       -
             hardeningDisable = [ "all" ];

     

       22
       -
             patchPhase = ''

     

       23
       -
               sed -i 's|/usr/include/smbios_c/token.h|smbios_c/token.h|' \

     

       24
       -
                 linux/libfwup.c

     

       25
       -
               sed -i 's|/usr/share|$(prefix)share|' linux/Makefile

     

       26
       -
               sed -i "s|/usr/include|$out/include|" linux/fwup.pc.in

     

       27
       -
               find . -type f -print0 | xargs -0 sed -i -e 's|/boot/efi|/boot|g' -e 's|/boot/efi/EFI|/boot/EFI|g'

     

       28
       -
             '';

     

       29
       -
             configurePhase = ''

     

       30
       -
               arch=$(cc -dumpmachine | cut -f1 -d- | sed 's,i[3456789]86,ia32,' )

     

       31
       -
               export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gnu-efi}/include/efi -I${efivar}/include/efivar -I${gnu-efi}/include/efi/$arch"

     

       32
       -
             '';

     

       33
       -
             meta =

     

       34
       -
               { license = [ stdenv.lib.licenses.gpl2 ];

     

       35
       -
                 platforms = stdenv.lib.platforms.linux;

     

       36
       -
               };

     

       37
       -
           }

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0

···

       1
       +
       { efivar, fetchurl, gettext, gnu-efi, libsmbios, pkgconfig, popt, stdenv }:

     

       2
       +
       let

     

       3
       +
         version = "10";

     

       4
       +
       in stdenv.mkDerivation {

     

       5
       +
         name = "fwupdate-${version}";

     

       6
       +
         src = fetchurl {

     

       7
       +
           url = "https://github.com/rhinstaller/fwupdate/releases/download/${version}/fwupdate-${version}.tar.bz2";

     

       8
       +
           sha256 = "0fpk3q0msq2l0bs2mvk0cqp8jbwnmi17ggc81r4v96h4jxh2rx3k";

     

       9
       +
         };

     

       10
       +
       

     

       11
       +
         patches = [

     

       12
       +
           # https://github.com/rhboot/fwupdate/pull/99

     

       13
       +
           ./fix-paths.patch

     

       14
       +
           ./do-not-create-sharedstatedir.patch

     

       15
       +
         ];

     

       16
       +
       

     

       17
       +
         NIX_CFLAGS_COMPILE = [ "-I${gnu-efi}/include/efi" ];

     

       18
       +
       

     

       19
       +
         # TODO: Just apply the disable to the efi subdir

     

       20
       +
         hardeningDisable = [ "stackprotector" ];

     

       21
       +
       

     

       22
       +
         makeFlags = [

     

       23
       +
           "EFIDIR=nixos"

     

       24
       +
           "prefix=$(out)"

     

       25
       +
           "LIBDIR=$(out)/lib"

     

       26
       +
           "GNUEFIDIR=${gnu-efi}/lib"

     

       27
       +
           "ESPMOUNTPOINT=$(out)/boot"

     

       28
       +
         ];

     

       29
       +
       

     

       30
       +
         nativeBuildInputs = [

     

       31
       +
           pkgconfig

     

       32
       +
           gettext

     

       33
       +
         ];

     

       34
       +
       

     

       35
       +
         buildInputs = [

     

       36
       +
           gnu-efi

     

       37
       +
           libsmbios

     

       38
       +
           popt

     

       39
       +
         ];

     

       40
       +
       

     

       41
       +
         propagatedBuildInputs = [

     

       42
       +
           efivar

     

       43
       +
         ];

     

       44
       +
       

     

       45
       +
         # TODO: fix wrt cross-compilation

     

       46
       +
         preConfigure = ''

     

       47
       +
           arch=$(cc -dumpmachine | cut -f1 -d- | sed 's,i[3456789]86,ia32,' )

     

       48
       +
           export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gnu-efi}/include/efi/$arch"

     

       49
       +
         '';

     

       50
       +
       

     

       51
       +
         postInstall = ''

     

       52
       +
           rm -rf $out/src

     

       53
       +
           rm -rf $out/lib/debug

     

       54
       +
         '';

     

       55
       +
       

     

       56
       +
         meta = with stdenv.lib; {

     

       57
       +
           description = "Tools for using the ESRT and UpdateCapsule() to apply firmware updates";

     

       58
       +
           maintainers = with maintainers; [ ];

     

       59
       +
           license = licenses.gpl2;

     

       60
       +
           platforms = platforms.linux;

     

       61
       +
         };

     

       62
       +
       }

+10

pkgs/os-specific/linux/firmware/fwupdate/do-not-create-sharedstatedir.patch

···

       1
       +
       --- a/linux/Makefile

     

       2
       +
       +++ b/linux/Makefile

     

       3
       +
       @@ -131,7 +131,6 @@

     

       4
       +
        		ln -fs $(x) $(patsubst %.so.1.$(VERSION),%.so.1,$(DESTDIR)$(libdir)/$(x)) ;\

     

       5
       +
        		ln -fs $(x) $(patsubst %.so.1.$(VERSION),%.so,$(DESTDIR)$(libdir)/$(x)) ;\

     

       6
       +
        		)

     

       7
       +
       -	$(INSTALL) -d -m 755 $(DESTDIR)$(sharedstatedir)/fwupdate/

     

       8
       +
        	$(INSTALL) -d -m 755 $(DESTDIR)$(libexecdir)/fwupdate/

     

       9
       +
        	$(INSTALL) -m 755 cleanup $(DESTDIR)$(libexecdir)/fwupdate/cleanup

     

       10
       +
        	$(INSTALL) -d -m 755 $(DESTDIR)$(libdatadir)/systemd/system

+116

pkgs/os-specific/linux/firmware/fwupdate/fix-paths.patch

···

       1
       +
       --- a/Make.defaults

     

       2
       +
       +++ b/Make.defaults

     

       3
       +
       @@ -18,19 +18,20 @@

     

       4
       +
        ABIDIFF		:= abidiff

     

       5
       +
        ABIDW		:= abidw

     

       6
       +
        prefix		?= /usr/

     

       7
       +
       -prefix		:= $(abspath $(prefix))/

     

       8
       +
       +prefix		:= $(abspath $(prefix))

     

       9
       +
       +exec_prefix		?= $(prefix)

     

       10
       +
        ARCH		= $(shell $(CC) -dumpmachine | cut -f1 -d- | sed s,i[3456789]86,ia32,)

     

       11
       +
        ifeq ($(ARCH),x86_64)

     

       12
       +
       -  LIBDIR	?= $(prefix)lib64

     

       13
       +
       +  LIBDIR	?= $(exec_prefix)/lib64

     

       14
       +
        endif

     

       15
       +
        ifeq ($(ARCH),ia32)

     

       16
       +
       -  LIBDIR	?= $(prefix)lib

     

       17
       +
       +  LIBDIR	?= $(exec_prefix)/lib

     

       18
       +
        endif

     

       19
       +
        ifeq ($(ARCH),aarch64)

     

       20
       +
       -  LIBDIR	?= $(prefix)lib64

     

       21
       +
       +  LIBDIR	?= $(exec_prefix)/lib64

     

       22
       +
        endif

     

       23
       +
        ifeq ($(ARCH),arm)

     

       24
       +
       -  LIBDIR	?= $(prefix)lib

     

       25
       +
       +  LIBDIR	?= $(exec_prefix)/lib

     

       26
       +
        endif

     

       27
       +
        LIBDIR		?= unknown

     

       28
       +
        ifeq ($(LIBDIR),unknown)

     

       29
       +
       @@ -45,13 +46,13 @@

     

       30
       +
        GNUEFIDIR	?= $(LIBDIR)/gnuefi

     

       31
       +
        libdir		?= $(LIBDIR)

     

       32
       +
        pcdir		?= $(libdir)/pkgconfig

     

       33
       +
       -mandir		?= $(prefix)share/man

     

       34
       +
       -includedir	?= $(prefix)include

     

       35
       +
       -bindir		?= $(prefix)bin

     

       36
       +
       -datadir 	?= $(prefix)share

     

       37
       +
       +mandir		?= $(prefix)/share/man

     

       38
       +
       +includedir	?= $(prefix)/include

     

       39
       +
       +bindir		?= $(exec_prefix)/bin

     

       40
       +
       +datadir 	?= $(prefix)/share

     

       41
       +
        localedir	?= $(datadir)/locale

     

       42
       +
       -libexecdir	?= $(prefix)libexec

     

       43
       +
       -libdatadir	?= $(prefix)lib

     

       44
       +
       +libexecdir	?= $(exec_prefix)/libexec

     

       45
       +
       +libdatadir	?= $(exec_prefix)/lib

     

       46
       +
        sharedstatedir	?= /var/lib

     

       47
       +
        

     

       48
       +
        EFIDIR		?= $(shell x=$$(which --skip-alias --skip-functions git 2>/dev/null) ; [ -n "$$x" ] && git config --get fwupdate.efidir)

     

       49
       +
       @@ -63,8 +64,8 @@

     

       50
       +
        	ESPMOUNTPOINT = "/boot/efi"

     

       51
       +
        endif

     

       52
       +
        

     

       53
       +
       -DEBUGINFO	?= $(prefix)lib/debug

     

       54
       +
       -DEBUGSOURCE	?= $(prefix)src/debug

     

       55
       +
       +DEBUGINFO	?= $(exec_prefix)/lib/debug

     

       56
       +
       +DEBUGSOURCE	?= $(prefix)/src/debug

     

       57
       +
        TARGETDIR	?= $(ESPMOUNTPOINT)/EFI/$(EFIDIR)

     

       58
       +
        

     

       59
       +
        .PHONY: check_efidir_error

     

       60
       +
       --- a/linux/Makefile

     

       61
       +
       +++ b/linux/Makefile

     

       62
       +
       @@ -93,16 +93,19 @@

     

       63
       +
        	sed -e "s,@@VERSION@@,$(VERSION),g" \

     

       64
       +
        		-e "s,@@FWUP_MAJOR_VERSION@@,$(MAJOR_VERSION),g" \

     

       65
       +
        		-e "s,@@FWUP_MINOR_VERSION@@,$(MINOR_VERSION),g" \

     

       66
       +
       +		-e "s,@@PREFIX@@,$(prefix),g" \

     

       67
       +
       +		-e "s,@@EXEC_PREFIX@@,$(exec_prefix),g" \

     

       68
       +
        		-e "s,@@SHAREDSTATEDIR@@,$(sharedstatedir),g" \

     

       69
       +
        		-e "s,@@ESPMOUNTPOINT@@,$(ESPMOUNTPOINT),g" \

     

       70
       +
        		-e "s,@@EFIDIR@@,$(EFIDIR),g" \

     

       71
       +
        		-e "s,@@LIBDIR@@,$(libdir),g" \

     

       72
       +
        		-e "s,@@LIBEXECDIR@@,$(libexecdir),g" \

     

       73
       +
       +		-e "s,@@INCLUDEDIR@@,$(includedir),g" \

     

       74
       +
        		$< > $@

     

       75
       +
        

     

       76
       +
        tester : tester.c

     

       77
       +
       -	$(CC) -Wall -Werror -ggdb -L. -I./include -I/usr/include/efivar \

     

       78
       +
       -		-lefivar -lfwup -o $@ $^

     

       79
       +
       +	$(CC) -Wall -Werror -ggdb -L. -I./include $(shell $(PKG_CONFIG) --cflags efivar) \

     

       80
       +
       +		$(shell $(PKG_CONFIG) --libs efivar) -lfwup -o $@ $^

     

       81
       +
        

     

       82
       +
        test : tester

     

       83
       +
        	LD_LIBRARY_PATH=$(shell pwd) ./tester

     

       84
       +
       @@ -134,6 +137,6 @@

     

       85
       +
        	$(INSTALL) -d -m 755 $(DESTDIR)$(libdatadir)/systemd/system

     

       86
       +
        	$(INSTALL) -m 644 cleanup.service \

     

       87
       +
        		$(DESTDIR)$(libdatadir)/systemd/system/fwupdate-cleanup.service

     

       88
       +
       -	$(INSTALL) -d -m 755 $(DESTDIR)/usr/share/bash-completion/completions/

     

       89
       +
       +	$(INSTALL) -d -m 755 $(DESTDIR)$(datadir)/bash-completion/completions/

     

       90
       +
        	$(INSTALL) -m 755 $(VPATH)/bash-completion \

     

       91
       +
       -		$(DESTDIR)/usr/share/bash-completion/completions/fwupdate

     

       92
       +
       +		$(DESTDIR)$(datadir)/bash-completion/completions/fwupdate

     

       93
       +
       --- a/linux/fwup.pc.in

     

       94
       +
       +++ b/linux/fwup.pc.in

     

       95
       +
       @@ -1,7 +1,7 @@

     

       96
       +
       -prefix=/usr

     

       97
       +
       -exec_prefix=/usr

     

       98
       +
       +prefix=@@PREFIX@@

     

       99
       +
       +exec_prefix=@@EXEC_PREFIX@@

     

       100
       +
        libdir=@@LIBDIR@@

     

       101
       +
       -includedir=/usr/include

     

       102
       +
       +includedir=@@INCLUDEDIR@@

     

       103
       +
        

     

       104
       +
        Name: fwup

     

       105
       +
        Description: Library for deployment of UEFI firmware updates.

     

       106
       +
       --- a/linux/libfwup.c

     

       107
       +
       +++ b/linux/libfwup.c

     

       108
       +
       @@ -35,7 +35,7 @@

     

       109
       +
        

     

       110
       +
        #include <dell-wmi-smi.h>

     

       111
       +
        #ifdef FWUPDATE_HAVE_LIBSMBIOS__

     

       112
       +
       -#include </usr/include/smbios_c/token.h>

     

       113
       +
       +#include <smbios_c/token.h>

     

       114
       +
        #include <smbios_c/smi.h>

     

       115
       +
        #endif

     

       116
       +

+12 -13

pkgs/os-specific/linux/libsmbios/default.nix

···

       1
       -
       { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, libtool, gettext

     

       2
        
       , libxml2, perl, doxygen }:

     

       3
        
       

     

       4
        
       

     

       5
        
       stdenv.mkDerivation rec {

     

       6
        
         name = "libsmbios-${version}";

     

       7
       -
         version = "2.3.3";

     

       8
        
       

     

       9
        
         src = fetchFromGitHub {

     

       10
        
           owner = "dell";

     

       11
        
           repo = "libsmbios";

     

       12
        
           rev = "v${version}";

     

       13
       -
           sha256 = "1cl5nb6qk8ki87hwqf9n1dd9nlhkjnlpdxlhzvm82za16gs7apkl";

     

       14
        
         };

     

       15
        
       

     

       16
       -
         nativeBuildInputs = [ autoreconfHook doxygen gettext libtool perl pkgconfig ];

     

       17
       -
         buildInputs = [ libxml2 ];

     

       18
        
       

     

       19
        
         configureFlags = [ "--disable-python" "--disable-graphviz" ];

     

       20
        
       

     

       21
        
         enableParallelBuilding = true;

     

       22
        
       

     

       23
       -
         postInstall =

     

       24
       -
           ''

     

       25
       -
             mkdir -p $out/include

     

       26
       -
             cp -a src/include/smbios_c $out/include/

     

       27
       -
             cp -a out/public-include/smbios_c $out/include/

     

       28
       -
           '';

     

       29
        
       

     

       30
        
         preFixup = ''rm -rf "$(pwd)" ''; # Hack to avoid TMPDIR in RPATHs

     

       31
        
       

     

       32
       -
         meta = {

     

       33
        
           homepage = https://github.com/dell/libsmbios;

     

       34
        
           description = "A library to obtain BIOS information";

     

       35
       -
           license = with stdenv.lib.licenses; [ osl21 gpl2Plus ];

     

       0
        
       
     

       36
        
           platforms = [ "i686-linux" "x86_64-linux" ];

     

       37
        
         };

     

       38
        
       }

···

       1
       +
       { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, help2man, gettext

     

       2
        
       , libxml2, perl, doxygen }:

     

       3
        
       

     

       4
        
       

     

       5
        
       stdenv.mkDerivation rec {

     

       6
        
         name = "libsmbios-${version}";

     

       7
       +
         version = "2.4.1";

     

       8
        
       

     

       9
        
         src = fetchFromGitHub {

     

       10
        
           owner = "dell";

     

       11
        
           repo = "libsmbios";

     

       12
        
           rev = "v${version}";

     

       13
       +
           sha256 = "158w5fz777is7nr5yhpr69b17nn6i1pavycxq1q9899frrpkzbsc";

     

       14
        
         };

     

       15
        
       

     

       16
       +
         nativeBuildInputs = [ autoreconfHook doxygen gettext libxml2 help2man perl pkgconfig ];

     

       0
        
       
     

       17
        
       

     

       18
        
         configureFlags = [ "--disable-python" "--disable-graphviz" ];

     

       19
        
       

     

       20
        
         enableParallelBuilding = true;

     

       21
        
       

     

       22
       +
         postInstall = ''

     

       23
       +
           mkdir -p $out/include

     

       24
       +
           cp -a src/include/smbios_c $out/include/

     

       25
       +
           cp -a out/public-include/smbios_c $out/include/

     

       26
       +
         '';

     

       0
        
       
     

       27
        
       

     

       28
        
         preFixup = ''rm -rf "$(pwd)" ''; # Hack to avoid TMPDIR in RPATHs

     

       29
        
       

     

       30
       +
         meta = with stdenv.lib; {

     

       31
        
           homepage = https://github.com/dell/libsmbios;

     

       32
        
           description = "A library to obtain BIOS information";

     

       33
       +
           license = with licenses; [ osl21 gpl2Plus ];

     

       34
       +
           maintainers = with maintainers; [ ];

     

       35
        
           platforms = [ "i686-linux" "x86_64-linux" ];

     

       36
        
         };

     

       37
        
       }

+4 -5

pkgs/tools/system/efibootmgr/default.nix

···

       5
        
         version = "15";

     

       6
        
       

     

       7
        
         nativeBuildInputs = [ pkgconfig ];

     

       8
       -
         

     

       9
        
         buildInputs = [ efivar popt ];

     

       10
        
       

     

       11
        
         src = fetchFromGitHub {

     

       12
       -
           owner = "rhinstaller";

     

       13
        
           repo = "efibootmgr";

     

       14
        
           rev = version;

     

       15
        
           sha256 = "0z7h1dirp8za6lbbf4f3dzn7l1px891rdymhkbqc10yj6gi1jpqp";

     

       16
        
         };

     

       17
        
       

     

       18
       -
         NIX_CFLAGS_COMPILE = "-I${efivar}/include/efivar";

     

       19
       -
       

     

       20
        
         makeFlags = [ "EFIDIR=nixos" ];

     

       21
        
       

     

       22
        
         installFlags = [ "prefix=$(out)" ];

     

       23
        
       

     

       24
        
         meta = with stdenv.lib; {

     

       25
        
           description = "A Linux user-space application to modify the Intel Extensible Firmware Interface (EFI) Boot Manager";

     

       26
       -
           homepage = https://github.com/rhinstaller/efibootmgr;

     

       27
        
           license = licenses.gpl2;

     

       0
        
       
     

       28
        
           platforms = platforms.linux;

     

       29
        
         };

     

       30
        
       }

···

       5
        
         version = "15";

     

       6
        
       

     

       7
        
         nativeBuildInputs = [ pkgconfig ];

     

       8
       +
       

     

       9
        
         buildInputs = [ efivar popt ];

     

       10
        
       

     

       11
        
         src = fetchFromGitHub {

     

       12
       +
           owner = "rhboot";

     

       13
        
           repo = "efibootmgr";

     

       14
        
           rev = version;

     

       15
        
           sha256 = "0z7h1dirp8za6lbbf4f3dzn7l1px891rdymhkbqc10yj6gi1jpqp";

     

       16
        
         };

     

       17
        
       

     

       0
        
       
     

       0
        
       
     

       18
        
         makeFlags = [ "EFIDIR=nixos" ];

     

       19
        
       

     

       20
        
         installFlags = [ "prefix=$(out)" ];

     

       21
        
       

     

       22
        
         meta = with stdenv.lib; {

     

       23
        
           description = "A Linux user-space application to modify the Intel Extensible Firmware Interface (EFI) Boot Manager";

     

       24
       +
           homepage = https://github.com/rhboot/efibootmgr;

     

       25
        
           license = licenses.gpl2;

     

       26
       +
           maintainers = with maintainers; [ ];

     

       27
        
           platforms = platforms.linux;

     

       28
        
         };

     

       29
        
       }