public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meson: fix for structured attrs

Browse Source
This commit is contained in:
Robin Gloster 2019-11-04 15:22:15 +01:00 committed by Jan Tojnar
parent 0f67406076
commit 548aff5a49
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/os-specific/linux/firmware/fwupd/default.nix
View File

@ -211,6 +211,7 @@ stdenv.mkDerivation rec {
"--localstatedir=/var" "--localstatedir=/var"
"--sysconfdir=/etc" "--sysconfdir=/etc"
"-Dsysconfdir_install=${placeholder "out"}/etc" "-Dsysconfdir_install=${placeholder "out"}/etc"
"--libexecdir=${placeholder "out"}/libexec"
] ++ stdenv.lib.optionals (!haveDell) [ ] ++ stdenv.lib.optionals (!haveDell) [
"-Dplugin_dell=false" "-Dplugin_dell=false"
"-Dplugin_synaptics=false" "-Dplugin_synaptics=false"
@ -220,12 +221,6 @@ stdenv.mkDerivation rec {
"-Dplugin_flashrom=true" "-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 = '' postInstall = ''
moveToOutput share/installed-tests "$installedTests" moveToOutput share/installed-tests "$installedTests"
wrapProgram $installedTests/share/installed-tests/fwupd/hardware.py \ wrapProgram $installedTests/share/installed-tests/fwupd/hardware.py \