diff options
| author | Will Dietz <w@wdtz.org> | 2019-01-04 21:30:13 -0600 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-01-27 21:26:43 +0100 |
| commit | 7dd30dd64b88a3b06a7e6d101d69e12133bb5b48 (patch) | |
| tree | 0a0ab389e73118009765b3895503dde369608e09 /pkgs/os-specific/linux/firmware/fwupd | |
| parent | 55fa570046bd26b0894e644b3f319ab060249162 (diff) | |
| download | nixpkgs-7dd30dd64b88a3b06a7e6d101d69e12133bb5b48.tar nixpkgs-7dd30dd64b88a3b06a7e6d101d69e12133bb5b48.tar.gz nixpkgs-7dd30dd64b88a3b06a7e6d101d69e12133bb5b48.tar.bz2 nixpkgs-7dd30dd64b88a3b06a7e6d101d69e12133bb5b48.tar.lz nixpkgs-7dd30dd64b88a3b06a7e6d101d69e12133bb5b48.tar.xz nixpkgs-7dd30dd64b88a3b06a7e6d101d69e12133bb5b48.tar.zst nixpkgs-7dd30dd64b88a3b06a7e6d101d69e12133bb5b48.zip | |
fwupd: put plugins in "out", restore "lib" output w/o cycle
Diffstat (limited to 'pkgs/os-specific/linux/firmware/fwupd')
| -rw-r--r-- | pkgs/os-specific/linux/firmware/fwupd/default.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index e505dafbeb3..47e8cd0db20 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -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 |