summary refs log tree commit diff
path: root/nixos/modules/services/desktops/malcontent.nix
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2020-07-23 19:34:12 +0200
committerJan Tojnar <jtojnar@gmail.com>2020-07-23 21:59:23 +0200
commit097117cf72b55eccae767d2053f3f4d1444edc07 (patch)
tree4cf81432bd09c60943de80ea742ffbee8c59ea01 /nixos/modules/services/desktops/malcontent.nix
parent5717d9d2f7ca0662291910c52f1d7b95b568fec2 (diff)
downloadnixpkgs-097117cf72b55eccae767d2053f3f4d1444edc07.tar
nixpkgs-097117cf72b55eccae767d2053f3f4d1444edc07.tar.gz
nixpkgs-097117cf72b55eccae767d2053f3f4d1444edc07.tar.bz2
nixpkgs-097117cf72b55eccae767d2053f3f4d1444edc07.tar.lz
nixpkgs-097117cf72b55eccae767d2053f3f4d1444edc07.tar.xz
nixpkgs-097117cf72b55eccae767d2053f3f4d1444edc07.tar.zst
nixpkgs-097117cf72b55eccae767d2053f3f4d1444edc07.zip
malcontent: 0.7.0 → 0.8.0
* 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.
Diffstat (limited to 'nixos/modules/services/desktops/malcontent.nix')
-rw-r--r--nixos/modules/services/desktops/malcontent.nix5
1 files changed, 4 insertions, 1 deletions
diff --git a/nixos/modules/services/desktops/malcontent.nix b/nixos/modules/services/desktops/malcontent.nix
index 5d6912595b5..1fbeb17e6ae 100644
--- a/nixos/modules/services/desktops/malcontent.nix
+++ b/nixos/modules/services/desktops/malcontent.nix
@@ -28,7 +28,10 @@ with lib;
       malcontent-ui
     ];
 
-    services.dbus.packages = [ pkgs.malcontent ];
+    services.dbus.packages = [
+      # D-Bus services are in `out`, not the default `bin` output that would be picked up by `makeDbusConf`.
+      pkgs.malcontent.out
+    ];
 
     services.accounts-daemon.enable = true;