From 283ef6bc6d075f85f049299b11c0f5ef417a9553 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Mon, 14 Oct 2019 11:00:09 +0100 Subject: 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 --- pkgs/os-specific/linux/firmware/fwupd/default.nix | 6 ------ 1 file changed, 6 deletions(-) (limited to 'pkgs/os-specific/linux') 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 = '' -- cgit 1.4.1