summary refs log tree commit diff
path: root/pkgs/os-specific/linux/firmware
diff options
context:
space:
mode:
authorJörg Thalheim <joerg@thalheim.io>2019-10-14 11:00:09 +0100
committerJörg Thalheim <joerg@thalheim.io>2019-10-14 11:01:45 +0100
commit283ef6bc6d075f85f049299b11c0f5ef417a9553 (patch)
treefa39b2180b591e720a2c8356e4e9c16ee714c397 /pkgs/os-specific/linux/firmware
parent4d28337d57311bfa57adcbed2d3a24b916b64e3a (diff)
downloadnixpkgs-283ef6bc6d075f85f049299b11c0f5ef417a9553.tar
nixpkgs-283ef6bc6d075f85f049299b11c0f5ef417a9553.tar.gz
nixpkgs-283ef6bc6d075f85f049299b11c0f5ef417a9553.tar.bz2
nixpkgs-283ef6bc6d075f85f049299b11c0f5ef417a9553.tar.lz
nixpkgs-283ef6bc6d075f85f049299b11c0f5ef417a9553.tar.xz
nixpkgs-283ef6bc6d075f85f049299b11c0f5ef417a9553.tar.zst
nixpkgs-283ef6bc6d075f85f049299b11c0f5ef417a9553.zip
Revert "fwupd: Move D-Bus conf file to share/dbus-1/system.d"
This reverts commit ad6aada7e2c3ece14e5ab0e34acdcf35f11e4014.

The patch does not apply to our version.
This commit was part of https://github.com/NixOS/nixpkgs/pull/68875

cc @worldofpeace
Diffstat (limited to 'pkgs/os-specific/linux/firmware')
-rw-r--r--pkgs/os-specific/linux/firmware/fwupd/default.nix6
1 files changed, 0 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix
index f298073d11a..75144799d01 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/default.nix
+++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix
@@ -2,7 +2,6 @@
 
 { stdenv
 , fetchurl
-, fetchpatch
 , substituteAll
 , gtk-doc
 , pkgconfig
@@ -154,11 +153,6 @@ 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 = ''