mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-24 22:53:42 +00:00
097117cf72
* Update: https://gitlab.freedesktop.org/pwithnall/malcontent/-/releases/0.8.0 * Fix the separation patch. * Add `itstool` to ui (needed for building localized help). * Use `pkg-config` instead of the `pkgconfig` alias. * Fix some issues related to multiple outputs: * Make the module pass specific output to `dbus.packages` since the `dbus` NixOS module will not generate configuration with correct interface paths otherwise. * Change `malcontent-ui` package to primarily-a-program type derivation (`out`+`lib` instead of `bin`+`out`) since there are more and more `malcontent-control`-specific assets. * This also fixes the issue where application data (desktop files, icons…) were installed to `out`, which is not installed by `environment.systemPackages`/`system-path.nix`’s `buildEnv` by default when `bin` output is also present. * Make `malcontent` package install `out` output too so that `system-path.nix` links that too. It contains the AccountsService & Polkit data files. * Split the library and PAM module out of `malcontent.out` so that they are not installed with the data files. * This revealed a bug in the `gobject-introspection` setup hook.
59 lines
1.7 KiB
Diff
59 lines
1.7 KiB
Diff
commit 363c5be465dd6dde35c3d31abd7b5cca9b1f3a9f
|
||
Author: Jan Tojnar <jtojnar@gmail.com>
|
||
Date: Thu Jul 23 18:49:03 2020 +0200
|
||
|
||
Improve separation between malcontent and malcontent-ui packages
|
||
|
||
These artefacts go into both packages by default:
|
||
|
||
* malcontent-control – a CLI tool
|
||
* PAM module
|
||
* gettext locale data
|
||
* help pages ✨
|
||
* AccountService/D-Bus interfaces
|
||
* Polkit com.endlessm.ParentalControls rules and policy
|
||
|
||
Items marked with ✨ will go to ui package, while the rest is installed with the base library.
|
||
|
||
See also the packaging done by upstream in Endless:
|
||
https://github.com/endlessm/malcontent/tree/5482b7eb99aee9b8c344629bc078e193d3c26ffc/debian
|
||
|
||
Cannot upstream this since they are worried about maintainability:
|
||
https://gitlab.freedesktop.org/pwithnall/malcontent/merge_requests/38#note_437946
|
||
|
||
diff --git a/meson.build b/meson.build
|
||
index 6e1dfa5..196350b 100644
|
||
--- a/meson.build
|
||
+++ b/meson.build
|
||
@@ -123,9 +123,8 @@ test_env = [
|
||
'LC_ALL=C.UTF-8',
|
||
]
|
||
|
||
-subdir('accounts-service')
|
||
-subdir('help')
|
||
if not get_option('use_system_libmalcontent')
|
||
+ subdir('accounts-service')
|
||
subdir('libmalcontent')
|
||
else
|
||
libmalcontent_api_version = '0'
|
||
@@ -136,11 +135,16 @@ endif
|
||
if get_option('ui').enabled()
|
||
subdir('libmalcontent-ui')
|
||
endif
|
||
-subdir('malcontent-client')
|
||
+if not get_option('use_system_libmalcontent')
|
||
+ subdir('malcontent-client')
|
||
+endif
|
||
if get_option('ui').enabled()
|
||
subdir('malcontent-control')
|
||
+ subdir('help')
|
||
+endif
|
||
+if not get_option('use_system_libmalcontent')
|
||
+ subdir('pam')
|
||
+ subdir('po')
|
||
endif
|
||
-subdir('pam')
|
||
-subdir('po')
|
||
|
||
meson.add_install_script('build-aux/meson_post_install.py')
|