movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

nixos/udisks2: add package option (#293495)

Browse source
This commit is contained in:
Sandro 2024-11-11 14:57:07 +01:00 • committed by GitHub
commit 3d5dcee08a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
nixos/modules/services/hardware/udisks2.nix
View file

@ -18,6 +18,8 @@ in
enable = lib.mkEnableOption "udisks2, a DBus service that allows applications to query and manipulate storage devices"; enable = lib.mkEnableOption "udisks2, a DBus service that allows applications to query and manipulate storage devices";
package = lib.mkPackageOption pkgs "udisks2" {};
mountOnMedia = lib.mkOption { mountOnMedia = lib.mkOption {
type = lib.types.bool; type = lib.types.bool;
default = false; default = false;
@ -67,11 +69,11 @@ in
config = lib.mkIf config.services.udisks2.enable { config = lib.mkIf config.services.udisks2.enable {
environment.systemPackages = [ pkgs.udisks2 ]; environment.systemPackages = [ cfg.package ];
environment.etc = (lib.mapAttrs' (name: value: lib.nameValuePair "udisks2/${name}" { source = value; } ) configFiles) // ( environment.etc = (lib.mapAttrs' (name: value: lib.nameValuePair "udisks2/${name}" { source = value; } ) configFiles) // (
let let
libblockdev = pkgs.udisks2.libblockdev; libblockdev = cfg.package.libblockdev;
majorVer = lib.versions.major libblockdev.version; majorVer = lib.versions.major libblockdev.version;
in { in {
# We need to make sure /etc/libblockdev/@major_ver@/conf.d is populated to avoid # We need to make sure /etc/libblockdev/@major_ver@/conf.d is populated to avoid
@ -82,18 +84,18 @@ in
security.polkit.enable = true; security.polkit.enable = true;
services.dbus.packages = [ pkgs.udisks2 ]; services.dbus.packages = [ cfg.package ];
systemd.tmpfiles.rules = [ "d /var/lib/udisks2 0755 root root -" ] systemd.tmpfiles.rules = [ "d /var/lib/udisks2 0755 root root -" ]
++ lib.optional cfg.mountOnMedia "D! /media 0755 root root -"; ++ lib.optional cfg.mountOnMedia "D! /media 0755 root root -";
services.udev.packages = [ pkgs.udisks2 ]; services.udev.packages = [ cfg.package ];
services.udev.extraRules = lib.optionalString cfg.mountOnMedia '' services.udev.extraRules = lib.optionalString cfg.mountOnMedia ''
ENV{ID_FS_USAGE}=="filesystem", ENV{UDISKS_FILESYSTEM_SHARED}="1" ENV{ID_FS_USAGE}=="filesystem", ENV{UDISKS_FILESYSTEM_SHARED}="1"
''; '';
systemd.packages = [ pkgs.udisks2 ]; systemd.packages = [ cfg.package ];
}; };
} }