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

fwupd: Fix localstatedir

Browse Source
This commit is contained in:
Shea Levy 2017-02-27 15:28:43 -05:00
parent c710a2d477
commit e292d166e8
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,8 @@ let version = "0.8.1"; in
polkit gcab appstream-glib gusb sqlite libarchive libsoup polkit gcab appstream-glib gusb sqlite libarchive libsoup
docbook2x libxslt libelf libsmbios fwupdate libyaml valgrind docbook2x libxslt libelf libsmbios fwupdate libyaml valgrind
]; ];
patchPhase = '' patches = [ ./localstatedir-check-perms.patch ];
postPatch = ''
sed -i -e \ sed -i -e \
's|/usr/bin/gpgme-config|${gpgme.dev}/bin/gpgme-config|' -e \ 's|/usr/bin/gpgme-config|${gpgme.dev}/bin/gpgme-config|' -e \
's|/usr/bin/gpg-error-config|${libgpgerror.dev}/bin/gpg-error-config|' \ 's|/usr/bin/gpg-error-config|${libgpgerror.dev}/bin/gpg-error-config|' \
@ -27,6 +28,7 @@ let version = "0.8.1"; in
configureFlags = configureFlags =
[ "--with-systemdunitdir=$(out)/lib/systemd/system" [ "--with-systemdunitdir=$(out)/lib/systemd/system"
"--with-udevrulesdir=$(out)/lib/udev/rules.d" "--with-udevrulesdir=$(out)/lib/udev/rules.d"
"--localstatedir=/var"
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;
meta = meta =

12
pkgs/os-specific/linux/firmware/fwupd/localstatedir-check-perms.patch Normal file
View File

@ -0,0 +1,12 @@
diff -Naur fwupd-0.8.1-orig/src/Makefile.in fwupd-0.8.1/src/Makefile.in
--- fwupd-0.8.1-orig/src/Makefile.in 2017-02-24 02:59:23.000000000 -0500
+++ fwupd-0.8.1/src/Makefile.in 2017-02-27 15:06:56.218901891 -0500
@@ -1639,7 +1639,7 @@
$(srcdir)/fwupd.gresource.xml
install-data-hook:
- if test -w $(DESTDIR)$(prefix)/; then \
+ if test -w $$(dirname $(DESTDIR)$(localstatedir)/); then \
mkdir -p $(DESTDIR)$(localstatedir)/lib/fwupd; \
chmod 0755 $(DESTDIR)$(localstatedir)/lib/fwupd; \
mkdir -p $(DESTDIR)$(localstatedir)/cache/app-info/xmls; \