fwupd: put plugins in "out", restore "lib" output w/o cycle
This commit is contained in:
parent
55fa570046
commit
7dd30dd64b
@ -22,7 +22,7 @@ in stdenv.mkDerivation {
|
||||
sha256 = "11qpgincndahq96rbm2kgcy9kw5n9cmbbilsrqcqcyk7mvv464sl";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" "man" "installedTests" ];
|
||||
outputs = [ "out" "lib" "dev" "devdoc" "man" "installedTests" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson ninja gtk-doc pkgconfig gobject-introspection intltool glibcLocales shared-mime-info
|
||||
@ -48,6 +48,9 @@ in stdenv.mkDerivation {
|
||||
|
||||
patchShebangs .
|
||||
substituteInPlace data/installed-tests/fwupdmgr.test.in --subst-var-by installedtestsdir "$installedTests/share/installed-tests/fwupd"
|
||||
substituteInPlace meson.build \
|
||||
--replace "plugin_dir = join_paths(libdir, 'fwupd-plugins-3')" \
|
||||
"plugin_dir = join_paths('${placeholder "out"}', 'fwupd_plugins-3')"
|
||||
'';
|
||||
|
||||
# /etc/os-release not available in sandbox
|
||||
|
Loading…
Reference in New Issue
Block a user