mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-11 15:27:20 +03:00
Merge pull request #253255 from R-VdP/fwupd_1_9_5
This commit is contained in:
commit
74b1db5164
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user