diff options
author | Will Dietz <w@wdtz.org> | 2019-03-01 08:31:58 -0600 |
---|---|---|
committer | worldofpeace <worldofpeace@protonmail.ch> | 2019-07-11 11:10:19 -0400 |
commit | 5dc9fec732d3bdd00ea75bff0cef78406c11d98b (patch) | |
tree | efa9b05770e9b6f2c7315997d6b1c1d2f6e4d63d /pkgs/os-specific/linux/firmware/fwupd/default.nix | |
parent | f633bf64e9b1f4c75e8e00a755f9d35c6abfb3fe (diff) | |
download | nixpkgs-5dc9fec732d3bdd00ea75bff0cef78406c11d98b.tar nixpkgs-5dc9fec732d3bdd00ea75bff0cef78406c11d98b.tar.gz nixpkgs-5dc9fec732d3bdd00ea75bff0cef78406c11d98b.tar.bz2 nixpkgs-5dc9fec732d3bdd00ea75bff0cef78406c11d98b.tar.lz nixpkgs-5dc9fec732d3bdd00ea75bff0cef78406c11d98b.tar.xz nixpkgs-5dc9fec732d3bdd00ea75bff0cef78406c11d98b.tar.zst nixpkgs-5dc9fec732d3bdd00ea75bff0cef78406c11d98b.zip |
fwupd: patch in paths to tools used as runtime deps
Diffstat (limited to 'pkgs/os-specific/linux/firmware/fwupd/default.nix')
-rw-r--r-- | pkgs/os-specific/linux/firmware/fwupd/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 48b502448be..a60417d8e23 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -5,6 +5,7 @@ , ninja, gcab, gnutls, python3, wrapGAppsHook, json-glib, bash-completion , shared-mime-info, umockdev, vala, makeFontsConf, freefont_ttf , cairo, freetype, fontconfig, pango +, bubblewrap, efibootmgr, flashrom, tpm2-tools }: # Updating? Keep $out/etc synchronized with passthru.filesInstalledToEtc @@ -38,7 +39,12 @@ in stdenv.mkDerivation rec { ]; patches = [ - ./fix-paths.patch + (substituteAll { + src = ./fix-paths.patch; + inherit flashrom efibootmgr bubblewrap; + tpm2_tools = "${tpm2-tools}"; + }) + ./add-option-for-installation-sysconfdir.patch # installed tests are installed to different output @@ -61,6 +67,10 @@ in stdenv.mkDerivation rec { substituteInPlace meson.build \ --replace "plugin_dir = join_paths(libdir, 'fwupd-plugins-3')" \ "plugin_dir = join_paths('${placeholder "out"}', 'fwupd_plugins-3')" + + substituteInPlace data/meson.build --replace \ + "install_dir: systemd.get_pkgconfig_variable('systemdshutdowndir')" \ + "install_dir: '${placeholder "out"}/lib/systemd/system-shutdown'" ''; # /etc/os-release not available in sandbox |