Unverified Commit 9a8852d2 authored by Florian Klink's avatar Florian Klink Committed by GitHub
Browse files

fwupd: 2.0.6 -> 2.0.7 (#393130)

parents 43b32614 22e7be86
Loading
Loading
Loading
Loading
+2 −23
Original line number Diff line number Diff line
@@ -84,17 +84,6 @@
let
  isx86 = stdenv.hostPlatform.isx86;

  # Dell isn't supported on Aarch64
  haveDell = isx86;

  # only redfish for x86_64
  haveRedfish = stdenv.hostPlatform.isx86_64;

  # only use msr if x86 (requires cpuid)
  haveMSR = isx86;

  # # Currently broken on Aarch64
  # haveFlashrom = isx86;
  # Experimental
  haveFlashrom = isx86 && enableFlashrom;

@@ -141,7 +130,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
  pname = "fwupd";
  version = "2.0.6";
  version = "2.0.7";

  # libfwupd goes to lib
  # daemon, plug-ins and libfwupdplugin go to out
@@ -159,7 +148,7 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "fwupd";
    repo = "fwupd";
    tag = finalAttrs.version;
    hash = "sha256-//y2kkCrj6E3kKxZIEK2bBUiZezB9j4xzR6WrBdcpqQ=";
    hash = "sha256-Rus/GaLdoxC1vZskcZeKYE26ys7iBq6szgl2dh1UPsM=";
  };

  patches = [
@@ -262,7 +251,6 @@ stdenv.mkDerivation (finalAttrs: {
      (lib.mesonEnable "docs" true)
      # We are building the official releases.
      (lib.mesonEnable "supported_build" true)
      (lib.mesonEnable "launchd" false)
      (lib.mesonOption "systemd_root_prefix" "${placeholder "out"}")
      (lib.mesonOption "installed_test_prefix" "${placeholder "installedTests"}")
      "--localstatedir=/var"
@@ -281,17 +269,8 @@ stdenv.mkDerivation (finalAttrs: {
    ++ lib.optionals (!enablePassim) [
      (lib.mesonEnable "passim" false)
    ]
    ++ lib.optionals (!haveDell) [
      (lib.mesonEnable "plugin_synaptics_mst" false)
    ]
    ++ lib.optionals (!haveRedfish) [
      (lib.mesonEnable "plugin_redfish" false)
    ]
    ++ lib.optionals (!haveFlashrom) [
      (lib.mesonEnable "plugin_flashrom" false)
    ]
    ++ lib.optionals (!haveMSR) [
      (lib.mesonEnable "plugin_msr" false)
    ];

  # TODO: wrapGAppsHook3 wraps efi capsule even though it is not ELF