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

fwupd: put plugins in "out", restore "lib" output w/o cycle

Browse Source
This commit is contained in:
Will Dietz 2019-01-04 21:30:13 -06:00 committed by Jan Tojnar
parent 55fa570046
commit 7dd30dd64b
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,7 @@ in stdenv.mkDerivation {
sha256 = "11qpgincndahq96rbm2kgcy9kw5n9cmbbilsrqcqcyk7mvv464sl"; sha256 = "11qpgincndahq96rbm2kgcy9kw5n9cmbbilsrqcqcyk7mvv464sl";
}; };
outputs = [ "out" "dev" "devdoc" "man" "installedTests" ]; outputs = [ "out" "lib" "dev" "devdoc" "man" "installedTests" ];
nativeBuildInputs = [ nativeBuildInputs = [
meson ninja gtk-doc pkgconfig gobject-introspection intltool glibcLocales shared-mime-info meson ninja gtk-doc pkgconfig gobject-introspection intltool glibcLocales shared-mime-info
@ -48,6 +48,9 @@ in stdenv.mkDerivation {
patchShebangs . patchShebangs .
substituteInPlace data/installed-tests/fwupdmgr.test.in --subst-var-by installedtestsdir "$installedTests/share/installed-tests/fwupd" 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 # /etc/os-release not available in sandbox