diff options
| author | Robin Gloster <mail@glob.in> | 2019-11-04 15:22:15 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-30 04:50:37 +0100 |
| commit | 548aff5a49e1a94872054727d6aee04941ec04f1 (patch) | |
| tree | 0f6ed6756d3562ffbd982b74a0d086b813f3f0fb /pkgs/os-specific/linux/firmware | |
| parent | 0f674060767cfe2a9aa0a2c4e3b3937ad3e88be4 (diff) | |
| download | nixlib-548aff5a49e1a94872054727d6aee04941ec04f1.tar nixlib-548aff5a49e1a94872054727d6aee04941ec04f1.tar.gz nixlib-548aff5a49e1a94872054727d6aee04941ec04f1.tar.bz2 nixlib-548aff5a49e1a94872054727d6aee04941ec04f1.tar.lz nixlib-548aff5a49e1a94872054727d6aee04941ec04f1.tar.xz nixlib-548aff5a49e1a94872054727d6aee04941ec04f1.tar.zst nixlib-548aff5a49e1a94872054727d6aee04941ec04f1.zip | |
meson: fix for structured attrs
Diffstat (limited to 'pkgs/os-specific/linux/firmware')
| -rw-r--r-- | pkgs/os-specific/linux/firmware/fwupd/default.nix | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 1f6a7145b779..aa2d99781786 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -211,6 +211,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var" "--sysconfdir=/etc" "-Dsysconfdir_install=${placeholder "out"}/etc" + "--libexecdir=${placeholder "out"}/libexec" ] ++ stdenv.lib.optionals (!haveDell) [ "-Dplugin_dell=false" "-Dplugin_synaptics=false" @@ -220,12 +221,6 @@ stdenv.mkDerivation rec { "-Dplugin_flashrom=true" ]; - # TODO: We need to be able to override the directory flags from meson setup hook - # better – declaring them multiple times might become an error. - preConfigure = '' - mesonFlagsArray+=("--libexecdir=$out/libexec") - ''; - postInstall = '' moveToOutput share/installed-tests "$installedTests" wrapProgram $installedTests/share/installed-tests/fwupd/hardware.py \ |