about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2020-06-05 15:36:34 -0500
committerGitHub <noreply@github.com>2020-06-05 15:36:34 -0500
commitfa29c1002d1cd82eee612e7db8da0acd2f3b8937 (patch)
tree3ec36f30e394b3b992779c5ddbdaa80bf450a0fd /pkgs
parentd952565ab6cd5e8133fd92566eb66a5d79294d33 (diff)
parentec4d914143f0972afc201fc1cf3fa335838a5784 (diff)
downloadnixlib-fa29c1002d1cd82eee612e7db8da0acd2f3b8937.tar
nixlib-fa29c1002d1cd82eee612e7db8da0acd2f3b8937.tar.gz
nixlib-fa29c1002d1cd82eee612e7db8da0acd2f3b8937.tar.bz2
nixlib-fa29c1002d1cd82eee612e7db8da0acd2f3b8937.tar.lz
nixlib-fa29c1002d1cd82eee612e7db8da0acd2f3b8937.tar.xz
nixlib-fa29c1002d1cd82eee612e7db8da0acd2f3b8937.tar.zst
nixlib-fa29c1002d1cd82eee612e7db8da0acd2f3b8937.zip
Merge pull request #89356 from wizeman/u/fix-fwupd
fwupd: fix configuration on aarch64
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/os-specific/linux/firmware/fwupd/default.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix
index 9fe40cb60f70..87a37feb1cc8 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/default.nix
+++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix
@@ -247,7 +247,6 @@ stdenv.mkDerivation rec {
       "fwupd/ata.conf"
       # "fwupd/daemon.conf" # already created by the module
       "fwupd/redfish.conf"
-      "fwupd/remotes.d/dell-esrt.conf"
       "fwupd/remotes.d/lvfs-testing.conf"
       "fwupd/remotes.d/lvfs.conf"
       "fwupd/remotes.d/vendor.conf"
@@ -262,6 +261,8 @@ stdenv.mkDerivation rec {
       "pki/fwupd-metadata/GPG-KEY-Linux-Foundation-Metadata"
       "pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service"
       "pki/fwupd-metadata/LVFS-CA.pem"
+    ] ++ stdenv.lib.optionals haveDell [
+      "fwupd/remotes.d/dell-esrt.conf"
     ];
 
     # BlacklistPlugins key in fwupd/daemon.conf