diff options
| -rw-r--r-- | nixos/modules/services/hardware/cdemu.nix | 16 | ||||
| -rw-r--r-- | pkgs/misc/emulators/cdemu/gui.nix | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/nixos/modules/services/hardware/cdemu.nix b/nixos/modules/services/hardware/cdemu.nix index 32a454b39c07..bca78f6e8033 100644 --- a/nixos/modules/services/hardware/cdemu.nix +++ b/nixos/modules/services/hardware/cdemu.nix @@ -9,41 +9,41 @@ in { services.cdemu = { enable = mkOption { default = false; - description = "Whether to enable cdemu for users of appropriate group (default cdrom)"; + description = "Whether to enable cdemu for users of appropriate group (default cdrom)"; }; group = mkOption { default = "cdrom"; - description = "Required group for users of cdemu"; + description = "Required group for users of cdemu"; }; gui = mkOption { default = true; - description = "Whether to install cdemu GUI (gCDEmu)"; + description = "Whether to install cdemu GUI (gCDEmu)"; }; image-analyzer = mkOption { default = true; - description = "Whether to install image analyzer"; + description = "Whether to install image analyzer"; }; }; }; config = mkIf cfg.enable { - + boot = { extraModulePackages = [ pkgs.linuxPackages.vhba ]; kernelModules = [ "vhba" ]; }; - + services = { udev.extraRules = '' KERNEL=="vhba_ctl", MODE="0660", OWNER="root", GROUP="${cfg.group}" ''; dbus.packages = [ pkgs.cdemu-daemon ]; }; - + environment.systemPackages = [ pkgs.cdemu-daemon pkgs.cdemu-client ] ++ optional cfg.gui pkgs.gcdemu ++ optional cfg.image-analyzer pkgs.image-analyzer; }; - + } diff --git a/pkgs/misc/emulators/cdemu/gui.nix b/pkgs/misc/emulators/cdemu/gui.nix index a6982f13cf50..44c128e8c209 100644 --- a/pkgs/misc/emulators/cdemu/gui.nix +++ b/pkgs/misc/emulators/cdemu/gui.nix @@ -10,9 +10,9 @@ in callPackage pkg { postFixup = '' wrapProgram $out/bin/gcdemu \ --set PYTHONPATH "$PYTHONPATH" \ - --set GI_TYPELIB_PATH "$GI_TYPELIB_PATH" \ - --set XDG_DATA_DIRS "$out/share:$XDG_DATA_DIRS" - ''; + --set GI_TYPELIB_PATH "$GI_TYPELIB_PATH" \ + --set XDG_DATA_DIRS "$out/share:$XDG_DATA_DIRS" + ''; # TODO AppIndicator }; } |