Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2806041afc05
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 81e2fb53038d
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 30, 2019

  1. nixos/colord: don't run as root 

    Using systemd.packages because there's
a system colord service and colord-session user service
included.
    @worldofpeace
    worldofpeace committed Mar 30, 2019
    Copy the full SHA
    f22fbe1 View commit details

  2. Merge pull request #58458 from worldofpeace/colord/no-root 

    nixos/colord: don't run as root
    @infinisil
    infinisil authored Mar 30, 2019
    Copy the full SHA
    81e2fb5 View commit details
Showing with 11 additions and 9 deletions.
  1. +10 −9 nixos/modules/services/x11/colord.nix
  2. +1 −0 pkgs/tools/misc/colord/default.nix
19 changes: 10 additions & 9 deletions nixos/modules/services/x11/colord.nix
View file
Original file line number Diff line number Diff line change
@@ -18,22 +18,23 @@ in {

config = mkIf cfg.enable {

environment.systemPackages = [ pkgs.colord ];

services.dbus.packages = [ pkgs.colord ];

services.udev.packages = [ pkgs.colord ];

environment.systemPackages = [ pkgs.colord ];
systemd.packages = [ pkgs.colord ];

systemd.services.colord = {
description = "Manage, Install and Generate Color Profiles";
serviceConfig = {
Type = "dbus";
BusName = "org.freedesktop.ColorManager";
ExecStart = "${pkgs.colord}/libexec/colord";
PrivateTmp = true;
};
environment.etc."tmpfiles.d/colord.conf".source = "${pkgs.colord}/lib/tmpfiles.d/colord.conf";

users.users.colord = {
home = "/var/lib/colord";
group = "colord";
};

users.groups.colord = {};

};

}
1 change: 1 addition & 0 deletions pkgs/tools/misc/colord/default.nix
View file
Original file line number Diff line number Diff line change
@@ -56,6 +56,7 @@ stdenv.mkDerivation rec {
"-Dlibcolordcompat=true"
"-Dsane=true"
"-Dvapi=true"
"-Ddaemon_user=colord"
];

nativeBuildInputs = [