fwupd: 1.2.3 -> 1.2.8

* use C.UTF-8 instead of en_US
* refresh sysconfdir_install patch
  * extend to vendor-directory.conf
* update sysconfdir_install patch
* update file listing
This commit is contained in:
Will Dietz
2019-07-11 11:10:19 -04:00
committed by worldofpeace
parent f33c9e9cfb
commit f633bf64e9
2 changed files with 39 additions and 59 deletions
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, substituteAll, gtk-doc, pkgconfig, gobject-introspection, intltool
, libgudev, polkit, libxmlb, gusb, sqlite, libarchive, glib-networking
, libsoup, help2man, gpgme, libxslt, elfutils, libsmbios, efivar, glibcLocales
, gnu-efi, libyaml, valgrind, meson, libuuid, colord, docbook_xml_dtd_43, docbook_xsl
, libsoup, help2man, gpgme, libxslt, elfutils, libsmbios, efivar, gnu-efi
, libyaml, valgrind, meson, libuuid, colord, docbook_xml_dtd_43, docbook_xsl
, ninja, gcab, gnutls, python3, wrapGAppsHook, json-glib, bash-completion
, shared-mime-info, umockdev, vala, makeFontsConf, freefont_ttf
, cairo, freetype, fontconfig, pango
@@ -18,17 +18,17 @@ let
};
in stdenv.mkDerivation rec {
pname = "fwupd";
version = "1.2.3";
version = "1.2.8";
src = fetchurl {
url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
sha256 = "11qpgincndahq96rbm2kgcy9kw5n9cmbbilsrqcqcyk7mvv464sl";
sha256 = "0qbvq52c0scn1h99i1rf2la6rrhckin6gb02k7l0v3g07mxs20wc";
};
outputs = [ "out" "lib" "dev" "devdoc" "man" "installedTests" ];
nativeBuildInputs = [
meson ninja gtk-doc pkgconfig gobject-introspection intltool glibcLocales shared-mime-info
meson ninja gtk-doc pkgconfig gobject-introspection intltool shared-mime-info
valgrind gcab docbook_xml_dtd_43 docbook_xsl help2man libxslt python wrapGAppsHook vala
];
buildInputs = [
@@ -37,8 +37,6 @@ in stdenv.mkDerivation rec {
bash-completion cairo freetype fontconfig pango
];
LC_ALL = "en_US.UTF-8"; # For po/make-images
patches = [
./fix-paths.patch
./add-option-for-installation-sysconfdir.patch
@@ -114,10 +112,11 @@ in stdenv.mkDerivation rec {
# /etc/fwupd/uefi.conf is created by the services.hardware.fwupd NixOS module
passthru = {
filesInstalledToEtc = [
"fwupd/remotes.d/fwupd.conf"
"fwupd/remotes.d/dell-esrt.conf"
"fwupd/remotes.d/lvfs-testing.conf"
"fwupd/remotes.d/lvfs.conf"
"fwupd/remotes.d/vendor.conf"
"fwupd/remotes.d/vendor-directory.conf"
"pki/fwupd/GPG-KEY-Hughski-Limited"
"pki/fwupd/GPG-KEY-Linux-Foundation-Firmware"
"pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service"