diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-29 11:05:22 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-29 11:05:22 +0200 |
commit | 503081fa5be25e5054f490182a13f1c517e0664d (patch) | |
tree | f1a5d09c71ff8fba0066b7d5481ed4b8da132ffa /pkgs/os-specific/linux/firmware | |
parent | 9b09b832fc390b306611b6ec3bfffcc4452629fe (diff) | |
parent | 52af1d0930732142937b8db6c28b7fcd16770a7c (diff) | |
download | nixpkgs-503081fa5be25e5054f490182a13f1c517e0664d.tar nixpkgs-503081fa5be25e5054f490182a13f1c517e0664d.tar.gz nixpkgs-503081fa5be25e5054f490182a13f1c517e0664d.tar.bz2 nixpkgs-503081fa5be25e5054f490182a13f1c517e0664d.tar.lz nixpkgs-503081fa5be25e5054f490182a13f1c517e0664d.tar.xz nixpkgs-503081fa5be25e5054f490182a13f1c517e0664d.tar.zst nixpkgs-503081fa5be25e5054f490182a13f1c517e0664d.zip |
Merge staging into staging-next
Diffstat (limited to 'pkgs/os-specific/linux/firmware')
-rw-r--r-- | pkgs/os-specific/linux/firmware/fwupd/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 75144799d01..f298073d11a 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -2,6 +2,7 @@ { stdenv , fetchurl +, fetchpatch , substituteAll , gtk-doc , pkgconfig @@ -153,6 +154,11 @@ stdenv.mkDerivation rec { # needs a different set of modules than po/make-images inherit installedTestsPython; }) + # Don't use etc/dbus-1/system.d + (fetchpatch { + url = "https://github.com/fwupd/fwupd/commit/41a25be6f4b371c367904284e9251cd461ad5cfe.patch"; + sha256 = "0vv3x2pq5bpmg9c8ax5dsqcblw45n7jmzgw6p8h4asyjy57mzhaq"; + }) ]; postPatch = '' |