diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-08-03 09:40:20 -0400 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2019-08-03 09:40:20 -0400 |
| commit | f45a34ad06a60230432396cbff5ff28c9223aa2c (patch) | |
| tree | 7730932eb0912f15503b93d547db63ae8bdd288c /pkgs/os-specific/linux/firmware/fwupd/default.nix | |
| parent | 6a79f6fb711143da795e0416c3dc04ad4d3acf74 (diff) | |
| download | nixpkgs-f45a34ad06a60230432396cbff5ff28c9223aa2c.tar nixpkgs-f45a34ad06a60230432396cbff5ff28c9223aa2c.tar.gz nixpkgs-f45a34ad06a60230432396cbff5ff28c9223aa2c.tar.bz2 nixpkgs-f45a34ad06a60230432396cbff5ff28c9223aa2c.tar.lz nixpkgs-f45a34ad06a60230432396cbff5ff28c9223aa2c.tar.xz nixpkgs-f45a34ad06a60230432396cbff5ff28c9223aa2c.tar.zst nixpkgs-f45a34ad06a60230432396cbff5ff28c9223aa2c.zip | |
fwupd: wrap programs needed in PATH
Diffstat (limited to 'pkgs/os-specific/linux/firmware/fwupd/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/firmware/fwupd/default.nix | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index a60417d8e23..e0d70b5d43e 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -39,12 +39,7 @@ in stdenv.mkDerivation rec { ]; patches = [ - (substituteAll { - src = ./fix-paths.patch; - inherit flashrom efibootmgr bubblewrap; - tpm2_tools = "${tpm2-tools}"; - }) - + ./fix-paths.patch ./add-option-for-installation-sysconfdir.patch # installed tests are installed to different output @@ -77,7 +72,11 @@ in stdenv.mkDerivation rec { # doCheck = true; preFixup = '' - gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" + # See programs reached with fu_common_find_program_in_path in source + --prefix PATH : "${stdenv.lib.makeBinPath [ flashrom efibootmgr bubblewrap tpm2-tools ]}" + ) ''; mesonFlags = [ |