diff options
| author | maxine <35892750+amaxine@users.noreply.github.com> | 2023-09-16 17:48:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-16 17:48:55 +0200 |
| commit | 74b1db5164643b0165a9ad32a372d581c6ce9a80 (patch) | |
| tree | 1235c3e84e627d4cf19ac7983ecec31b962b38e1 /pkgs/os-specific/linux/firmware | |
| parent | 6fb1efb2d718bd1403090bd3226ade13e25dd283 (diff) | |
| parent | bed24e6636981af532001e783c295566510f258b (diff) | |
| download | nixpkgs-74b1db5164643b0165a9ad32a372d581c6ce9a80.tar nixpkgs-74b1db5164643b0165a9ad32a372d581c6ce9a80.tar.gz nixpkgs-74b1db5164643b0165a9ad32a372d581c6ce9a80.tar.bz2 nixpkgs-74b1db5164643b0165a9ad32a372d581c6ce9a80.tar.lz nixpkgs-74b1db5164643b0165a9ad32a372d581c6ce9a80.tar.xz nixpkgs-74b1db5164643b0165a9ad32a372d581c6ce9a80.tar.zst nixpkgs-74b1db5164643b0165a9ad32a372d581c6ce9a80.zip | |
Merge pull request #253255 from R-VdP/fwupd_1_9_5
Diffstat (limited to 'pkgs/os-specific/linux/firmware')
| -rw-r--r-- | pkgs/os-specific/linux/firmware/fwupd/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 25bce432bc5..5472cce0565 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -54,6 +54,7 @@ , libcbor , xz , enableFlashrom ? false +, enablePassim ? false }: let @@ -123,7 +124,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "fwupd"; - version = "1.9.4"; + version = "1.9.5"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -134,7 +135,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "fwupd"; repo = "fwupd"; rev = finalAttrs.version; - hash = "sha256-xjN6nHqg7sQzgojClySQEjLQBdI5291TxPhgLjKzKvk="; + hash = "sha256-dqbFgVgG2RQM5ZHIEIIJOmrjtwlaRXEyY+2OdDs4PGo="; }; patches = [ @@ -220,9 +221,10 @@ stdenv.mkDerivation (finalAttrs: { "-Dsysconfdir_install=${placeholder "out"}/etc" "-Defi_os_dir=nixos" "-Dplugin_modem_manager=enabled" - # We do not want to place the daemon into lib (cyclic reference) "--libexecdir=${placeholder "out"}/libexec" + ] ++ lib.optionals (!enablePassim) [ + "-Dpassim=disabled" ] ++ lib.optionals (!haveDell) [ "-Dplugin_dell=disabled" "-Dplugin_synaptics_mst=disabled" |