public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fwupd: 1.0.1 → 1.0.4

Browse Source
This commit is contained in:
Jan Tojnar 2017-12-17 09:16:38 +01:00
parent f94a17387c
commit fb29a093f1
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/os-specific/linux/firmware/fwupd/default.nix
View File

@ -2,15 +2,15 @@
, libgudev, polkit, appstream-glib, gusb, sqlite, libarchive, glib_networking , libgudev, polkit, appstream-glib, gusb, sqlite, libarchive, glib_networking
, libsoup, docbook2x, gpgme, libxslt, libelf, libsmbios, efivar, glibcLocales , libsoup, docbook2x, gpgme, libxslt, libelf, libsmbios, efivar, glibcLocales
, fwupdate, libyaml, valgrind, meson, libuuid, pygobject3, colord , fwupdate, libyaml, valgrind, meson, libuuid, pygobject3, colord
, pillow, ninja, gcab, gnutls, python3Packages, wrapGAppsHook , pillow, ninja, gcab, gnutls, python3Packages, wrapGAppsHook, json_glib
}: }:
let let
version = "1.0.2"; version = "1.0.4";
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "fwupd-${version}"; name = "fwupd-${version}";
src = fetchurl { src = fetchurl {
url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
sha256 = "15hrl6jq2kyvbxgjkv3qafqj2962il27gryakm39kvz2p2l1bacj"; sha256 = "1n4d6fw3ffg051072hbxn106s52x2wlh5dh2kxwdfjsb5kh03ra3";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -19,17 +19,11 @@ in stdenv.mkDerivation {
]; ];
buildInputs = [ buildInputs = [
polkit appstream-glib gusb sqlite libarchive libsoup libelf libsmbios fwupdate libyaml polkit appstream-glib gusb sqlite libarchive libsoup libelf libsmbios fwupdate libyaml
libgudev colord gpgme libuuid pillow gnutls glib_networking libgudev colord gpgme libuuid pillow gnutls glib_networking efivar json_glib
]; ];
LC_ALL = "en_US.UTF-8"; # For po/make-images LC_ALL = "en_US.UTF-8"; # For po/make-images
NIX_CFLAGS_COMPILE = [
"-I${efivar}/include/efivar"
# warning: "__LIBELF_INTERNAL__" is not defined
"-Wno-error=undef"
];
patches = [ patches = [
./fix-missing-deps.patch ./fix-missing-deps.patch
]; ];
@ -38,12 +32,12 @@ in stdenv.mkDerivation {
''; '';
mesonFlags = [ mesonFlags = [
"-Denable-man=false" "-Dman=false"
"-Denable-tests=false" "-Dtests=false"
"-Denable-doc=false" "-Dgtkdoc=false"
"-Dwith-bootdir=/boot" "-Dbootdir=/boot"
"-Dwith-udevdir=lib/udev" "-Dudevdir=lib/udev"
"-Dwith-systemdunitdir=lib/systemd/system" "-Dsystemdunitdir=lib/systemd/system"
"--localstatedir=/var" "--localstatedir=/var"
]; ];

22
pkgs/os-specific/linux/firmware/fwupd/fix-missing-deps.patch
View File

@ -2,7 +2,7 @@
+++ b/data/builder/meson.build +++ b/data/builder/meson.build
@@ -1,3 +0,0 @@ @@ -1,3 +0,0 @@
-install_data('README.md', -install_data('README.md',
- install_dir : join_paths(get_option('localstatedir'), 'lib', 'fwupd', 'builder') - install_dir : join_paths(localstatedir, 'lib', 'fwupd', 'builder')
-) -)
--- a/data/meson.build --- a/data/meson.build
+++ b/data/meson.build +++ b/data/meson.build
@ -11,15 +11,15 @@
endif endif
-install_data(['daemon.conf'], -install_data(['daemon.conf'],
- install_dir : join_paths(get_option('sysconfdir'), 'fwupd') - install_dir : join_paths(sysconfdir, 'fwupd')
-) -)
- -
install_data(['org.freedesktop.fwupd.metainfo.xml'], install_data(['org.freedesktop.fwupd.metainfo.xml'],
install_dir: join_paths(get_option('datadir'), 'metainfo') install_dir: join_paths(datadir, 'metainfo')
) )
install_data(['org.freedesktop.fwupd.conf'], install_data(['org.freedesktop.fwupd.conf'],
- install_dir : join_paths(get_option('sysconfdir'), 'dbus-1', 'system.d') - install_dir : join_paths(sysconfdir, 'dbus-1', 'system.d')
+ install_dir : join_paths(get_option('prefix'), 'etc', 'dbus-1', 'system.d') + install_dir : join_paths(get_option('prefix'), 'etc', 'dbus-1', 'system.d')
) )
@ -30,14 +30,14 @@
'GPG-KEY-Hughski-Limited', 'GPG-KEY-Hughski-Limited',
'GPG-KEY-Linux-Vendor-Firmware-Service', 'GPG-KEY-Linux-Vendor-Firmware-Service',
], ],
- install_dir : join_paths(get_option('sysconfdir'), 'pki', 'fwupd') - install_dir : join_paths(sysconfdir, 'pki', 'fwupd')
+ install_dir : join_paths(get_option('prefix'), 'etc', 'pki', 'fwupd') + install_dir : join_paths(get_option('prefix'), 'etc', 'pki', 'fwupd')
) )
install_data([ install_data([
'GPG-KEY-Linux-Vendor-Firmware-Service', 'GPG-KEY-Linux-Vendor-Firmware-Service',
], ],
- install_dir : join_paths(get_option('sysconfdir'), 'pki', 'fwupd-metadata') - install_dir : join_paths(sysconfdir, 'pki', 'fwupd-metadata')
+ install_dir : join_paths(get_option('prefix'), 'etc', 'pki', 'fwupd-metadata') + install_dir : join_paths(get_option('prefix'), 'etc', 'pki', 'fwupd-metadata')
) )
endif endif
@ -46,13 +46,13 @@
install_data([ install_data([
'LVFS-CA.pem', 'LVFS-CA.pem',
], ],
- install_dir : join_paths(get_option('sysconfdir'), 'pki', 'fwupd') - install_dir : join_paths(sysconfdir, 'pki', 'fwupd')
+ install_dir : join_paths(get_option('prefix'), 'etc', 'pki', 'fwupd') + install_dir : join_paths(get_option('prefix'), 'etc', 'pki', 'fwupd')
) )
install_data([ install_data([
'LVFS-CA.pem', 'LVFS-CA.pem',
], ],
- install_dir : join_paths(get_option('sysconfdir'), 'pki', 'fwupd-metadata') - install_dir : join_paths(sysconfdir, 'pki', 'fwupd-metadata')
+ install_dir : join_paths(get_option('prefix'), 'etc', 'pki', 'fwupd-metadata') + install_dir : join_paths(get_option('prefix'), 'etc', 'pki', 'fwupd-metadata')
) )
endif endif
@ -63,7 +63,7 @@
'lvfs.conf', 'lvfs.conf',
'lvfs-testing.conf', 'lvfs-testing.conf',
], ],
- install_dir : join_paths(get_option('sysconfdir'), 'fwupd', 'remotes.d') - install_dir : join_paths(sysconfdir, 'fwupd', 'remotes.d')
+ install_dir : join_paths(get_option('prefix'), 'etc', 'fwupd', 'remotes.d') + install_dir : join_paths(get_option('prefix'), 'etc', 'fwupd', 'remotes.d')
) )
endif endif
@ -72,7 +72,7 @@
output : 'fwupd.conf', output : 'fwupd.conf',
configuration : con2, configuration : con2,
install: true, install: true,
- install_dir: join_paths(get_option('sysconfdir'), 'fwupd', 'remotes.d'), - install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),
+ install_dir: join_paths(get_option('prefix'), 'etc', 'fwupd', 'remotes.d'), + install_dir: join_paths(get_option('prefix'), 'etc', 'fwupd', 'remotes.d'),
) )
configure_file( configure_file(
@ -80,7 +80,7 @@
output : 'vendor.conf', output : 'vendor.conf',
configuration : con2, configuration : con2,
install: true, install: true,
- install_dir: join_paths(get_option('sysconfdir'), 'fwupd', 'remotes.d'), - install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),
+ install_dir: join_paths(get_option('prefix'), 'etc', 'fwupd', 'remotes.d'), + install_dir: join_paths(get_option('prefix'), 'etc', 'fwupd', 'remotes.d'),
) )
--- a/meson_post_install.sh --- a/meson_post_install.sh