cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #253255 from R-VdP/fwupd_1_9_5

Browse source
This commit is contained in:
maxine 2023-09-16 17:48:55 +02:00 committed by GitHub
commit 74b1db5164
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/os-specific/linux/firmware/fwupd/default.nix
View file

@ -54,6 +54,7 @@
, libcbor , libcbor
, xz , xz
, enableFlashrom ? false , enableFlashrom ? false
, enablePassim ? false
}: }:
let let
@ -123,7 +124,7 @@ let
in in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "fwupd"; pname = "fwupd";
version = "1.9.4"; version = "1.9.5";
# libfwupd goes to lib # libfwupd goes to lib
# daemon, plug-ins and libfwupdplugin go to out # daemon, plug-ins and libfwupdplugin go to out
@ -134,7 +135,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "fwupd"; owner = "fwupd";
repo = "fwupd"; repo = "fwupd";
rev = finalAttrs.version; rev = finalAttrs.version;
hash = "sha256-xjN6nHqg7sQzgojClySQEjLQBdI5291TxPhgLjKzKvk="; hash = "sha256-dqbFgVgG2RQM5ZHIEIIJOmrjtwlaRXEyY+2OdDs4PGo=";
}; };
patches = [ patches = [
@ -220,9 +221,10 @@ stdenv.mkDerivation (finalAttrs: {
"-Dsysconfdir_install=${placeholder "out"}/etc" "-Dsysconfdir_install=${placeholder "out"}/etc"
"-Defi_os_dir=nixos" "-Defi_os_dir=nixos"
"-Dplugin_modem_manager=enabled" "-Dplugin_modem_manager=enabled"
# We do not want to place the daemon into lib (cyclic reference) # We do not want to place the daemon into lib (cyclic reference)
"--libexecdir=${placeholder "out"}/libexec" "--libexecdir=${placeholder "out"}/libexec"
] ++ lib.optionals (!enablePassim) [
"-Dpassim=disabled"
] ++ lib.optionals (!haveDell) [ ] ++ lib.optionals (!haveDell) [
"-Dplugin_dell=disabled" "-Dplugin_dell=disabled"
"-Dplugin_synaptics_mst=disabled" "-Dplugin_synaptics_mst=disabled"