From e81c487ba275ca1af7a81bcd287fd51380d277d0 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 11 Mar 2016 01:21:38 +0300 Subject: argyllcms: 1.8.2 -> 1.8.3 --- pkgs/tools/graphics/argyllcms/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix index fce383dcc9c4..3c7af45f81dd 100644 --- a/pkgs/tools/graphics/argyllcms/default.nix +++ b/pkgs/tools/graphics/argyllcms/default.nix @@ -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'"; -- cgit 1.4.1 From 776845bbeb79091657570c541f7daade2efe912a Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 11 Mar 2016 01:24:10 +0300 Subject: xiccd: init at 0.2.2 --- nixos/modules/module-list.nix | 1 + pkgs/tools/misc/xiccd/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 27 insertions(+) create mode 100644 pkgs/tools/misc/xiccd/default.nix (limited to 'pkgs/tools') diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 0105cc3cdf2c..640e8ae5c19d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -439,6 +439,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 diff --git a/pkgs/tools/misc/xiccd/default.nix b/pkgs/tools/misc/xiccd/default.nix new file mode 100644 index 000000000000..cdc2af195011 --- /dev/null +++ b/pkgs/tools/misc/xiccd/default.nix @@ -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; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c540ff849c8a..8824259a1649 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3871,6 +3871,8 @@ let xmpppy = pythonPackages.xmpppy; + xiccd = callPackage ../tools/misc/xiccd { }; + xorriso = callPackage ../tools/cd-dvd/xorriso { }; xpf = callPackage ../tools/text/xml/xpf { -- cgit 1.4.1 From cf9ddb27d6aa53826f7191cbddb561a05554018c Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 11 Mar 2016 01:58:22 +0300 Subject: colord: fix udev rules, add sane support --- pkgs/tools/misc/colord/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index 3ba5a138e5a7..7e6c3f30784e 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -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 -- cgit 1.4.1 From 4ebc7f74f7b80a44218bbc272c4d4b9350efac6b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 11 Mar 2016 02:31:47 +0300 Subject: colord-kde: fix build --- pkgs/tools/misc/colord-kde/default.nix | 3 +++ pkgs/tools/misc/colord-kde/fix_check_include_files.patch | 9 +++++++++ 2 files changed, 12 insertions(+) create mode 100644 pkgs/tools/misc/colord-kde/fix_check_include_files.patch (limited to 'pkgs/tools') diff --git a/pkgs/tools/misc/colord-kde/default.nix b/pkgs/tools/misc/colord-kde/default.nix index 606595f46057..52e1845b300f 100644 --- a/pkgs/tools/misc/colord-kde/default.nix +++ b/pkgs/tools/misc/colord-kde/default.nix @@ -14,6 +14,9 @@ stdenv.mkDerivation { buildInputs = [ colord libX11 libXrandr lcms2 kdelibs ]; + patches = [ ./fix_check_include_files.patch ]; + patchFlags = [ "-p0" ]; + enableParallelBuilding = true; meta = { diff --git a/pkgs/tools/misc/colord-kde/fix_check_include_files.patch b/pkgs/tools/misc/colord-kde/fix_check_include_files.patch new file mode 100644 index 000000000000..16d14a6a647a --- /dev/null +++ b/pkgs/tools/misc/colord-kde/fix_check_include_files.patch @@ -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}) \ No newline at end of file -- cgit 1.4.1