colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
a55e0fa92d
nixpkgs/pkgs/by-name/fw/fwupd/install-fwupdplugin-to-out.patch

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

15 lines
455 B
Diff
Raw Normal View History

fwupd: split daemon again In 1.3.5, fwupdprivate library was made into a shared fwupdplugin library. This library is considered semi-private and is used by fwupd daemon and fwupd plug-ins and now possibly third party plug-ins. The fwupdplugin library refers to the plug-in directory in fwupd.out causing a dependency cycle. For that reason we need to move it to out.
2020-02-06 17:49:23 +00:00
diff --git a/meson.build b/meson.build
fwupd: 1.8.4 -> 1.8.9
2023-01-22 02:16:58 +00:00
index 9ae278b66..7cddf1a0d 100644
fwupd: split daemon again In 1.3.5, fwupdprivate library was made into a shared fwupdplugin library. This library is considered semi-private and is used by fwupd daemon and fwupd plug-ins and now possibly third party plug-ins. The fwupdplugin library refers to the plug-in directory in fwupd.out causing a dependency cycle. For that reason we need to move it to out.
2020-02-06 17:49:23 +00:00
--- a/meson.build
+++ b/meson.build
fwupd: 1.8.4 -> 1.8.9
2023-01-22 02:16:58 +00:00
@@ -507,7 +507,7 @@ if build_standalone
fwupd: split daemon again In 1.3.5, fwupdprivate library was made into a shared fwupdplugin library. This library is considered semi-private and is used by fwupd daemon and fwupd plug-ins and now possibly third party plug-ins. The fwupdplugin library refers to the plug-in directory in fwupd.out causing a dependency cycle. For that reason we need to move it to out.
2020-02-06 17:49:23 +00:00
if host_machine.system() == 'windows'
fwupd: 1.8.4 -> 1.8.9
2023-01-22 02:16:58 +00:00
libdir_pkg = 'fwupd-@0@'.format(fwupd_version)
fwupd: split daemon again In 1.3.5, fwupdprivate library was made into a shared fwupdplugin library. This library is considered semi-private and is used by fwupd daemon and fwupd plug-ins and now possibly third party plug-ins. The fwupdplugin library refers to the plug-in directory in fwupd.out causing a dependency cycle. For that reason we need to move it to out.
2020-02-06 17:49:23 +00:00
else
fwupd: 1.8.4 -> 1.8.9
2023-01-22 02:16:58 +00:00
- libdir_pkg = join_paths(libdir, 'fwupd-@0@'.format(fwupd_version))
+ libdir_pkg = join_paths(prefix, 'lib', 'fwupd-@0@'.format(fwupd_version))
fwupd: split daemon again In 1.3.5, fwupdprivate library was made into a shared fwupdplugin library. This library is considered semi-private and is used by fwupd daemon and fwupd plug-ins and now possibly third party plug-ins. The fwupdplugin library refers to the plug-in directory in fwupd.out causing a dependency cycle. For that reason we need to move it to out.
2020-02-06 17:49:23 +00:00
endif
fwupd: 1.8.4 -> 1.8.9
2023-01-22 02:16:58 +00:00
conf.set_quoted('FWUPD_LIBDIR_PKG', libdir_pkg)
fwupd: split daemon again In 1.3.5, fwupdprivate library was made into a shared fwupdplugin library. This library is considered semi-private and is used by fwupd daemon and fwupd plug-ins and now possibly third party plug-ins. The fwupdplugin library refers to the plug-in directory in fwupd.out causing a dependency cycle. For that reason we need to move it to out.
2020-02-06 17:49:23 +00:00
endif
fwupd: 1.8.4 -> 1.8.9
2023-01-22 02:16:58 +00:00
Reference in New Issue Copy Permalink