Merge pull request #13823 from abbradar/colord

colord color management daemon
This commit is contained in:
Nikolay Amiantov 2016-03-11 13:50:12 +03:00
commit 08893956fb
8 changed files with 84 additions and 5 deletions

View file

@ -440,6 +440,7 @@
./services/web-servers/varnish/default.nix
./services/web-servers/winstone.nix
./services/web-servers/zope2.nix
./services/x11/colord.nix
./services/x11/unclutter.nix
./services/x11/desktop-managers/default.nix
./services/x11/display-managers/auto.nix

View file

@ -0,0 +1,39 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.colord;
in {
options = {
services.colord = {
enable = mkEnableOption "colord, the color management daemon";
};
};
config = mkIf cfg.enable {
services.dbus.packages = [ pkgs.colord ];
services.udev.packages = [ pkgs.colord ];
environment.systemPackages = [ 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;
};
};
};
}

View file

@ -2,7 +2,7 @@
, libXrender, libXext, libtiff, libjpeg, libpng, libXScrnSaver, writeText
, libXdmcp, libXau, lib, openssl, zlib }:
let
version = "1.8.2";
version = "1.8.3";
in
stdenv.mkDerivation rec {
name = "argyllcms-${version}";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
# Kind of flacky URL, it was reaturning 406 and inconsistent binaries for a
# while on me. It might be good to find a mirror
url = "http://www.argyllcms.com/Argyll_V${version}_src.zip";
sha256 = "0hnsciwak5chy4a421l8fz7amxzg8kbmy57a07dn460gdg6r63cy";
sha256 = "00ggh47qzb3xyl8rnppwxa6j113lr38aiwvsfyxwgs51aqmvq7bd";
# The argyllcms web server doesn't like curl ...
curlOpts = "--user-agent 'Mozilla/5.0'";

View file

@ -14,6 +14,9 @@ stdenv.mkDerivation {
buildInputs = [ colord libX11 libXrandr lcms2 kdelibs ];
patches = [ ./fix_check_include_files.patch ];
patchFlags = [ "-p0" ];
enableParallelBuilding = true;
meta = {

View file

@ -0,0 +1,9 @@
--- CMakeLists.txt.orig 2013-05-01 05:04:34.000000000 +1000
+++ CMakeLists.txt 2015-12-10 20:43:51.351800988 +1100
@@ -9,6 +9,7 @@
include(FindPkgConfig)
include(KDE4Defaults)
+include(CheckIncludeFiles)
include(ConfigureChecks.cmake)
message(STATUS "X randr is required, found: " ${XRANDR_1_3_FOUND})

View file

@ -1,7 +1,7 @@
{ stdenv, fetchzip, fetchgit, bashCompletion
, glib, polkit, pkgconfig, intltool, gusb, libusb1, lcms2, sqlite, systemd, dbus
, automake, autoconf, libtool, gtk_doc, which, gobjectIntrospection, argyllcms
, libgudev }:
, libgudev, sane-backends }:
stdenv.mkDerivation rec {
name = "colord-1.2.12";
@ -14,7 +14,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
configureFlags = [
"--with-udevrulesdir=$out/lib/udev/rules.d"
"--enable-sane"
"--with-udevrulesdir=$(out)/lib/udev/rules.d"
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
"--localstatedir=/var"
"--disable-bash-completion"
@ -27,7 +28,7 @@ stdenv.mkDerivation rec {
'';
buildInputs = [ glib polkit pkgconfig intltool gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection
bashCompletion argyllcms automake autoconf libgudev ];
bashCompletion argyllcms automake autoconf libgudev sane-backends ];
postInstall = ''
mkdir -p $out/etc/bash_completion.d

View file

@ -0,0 +1,24 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libX11, libXrandr, glib, colord }:
stdenv.mkDerivation rec {
name = "xiccd-${version}";
version = "0.2.2";
src = fetchFromGitHub {
owner = "agalakhov";
repo = "xiccd";
rev = "v${version}";
sha256 = "17p3vngmmjk52r5p8y41s19nwp7w25bgff68ffd50zdlicd33rsy";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ libX11 libXrandr glib colord ];
meta = with stdenv.lib; {
description = "X color profile daemon";
homepage = https://github.com/agalakhov/xiccd;
license = licenses.gpl3;
maintainers = with maintainers; [ abbradar ];
platforms = platforms.linux;
};
}

View file

@ -3888,6 +3888,8 @@ let
xmpppy = pythonPackages.xmpppy;
xiccd = callPackage ../tools/misc/xiccd { };
xorriso = callPackage ../tools/cd-dvd/xorriso { };
xpf = callPackage ../tools/text/xml/xpf {