diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2017-10-12 23:36:57 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2017-11-05 20:44:15 +0100 |
commit | cdd40ba79e7eca9674bdb23a65223ab10528219c (patch) | |
tree | 66524a8546fa7f9b40da6c5f232ce9df0c011523 /pkgs/tools | |
parent | 360f9b7706e0e371da846eba185740926a39bad2 (diff) | |
download | nixlib-cdd40ba79e7eca9674bdb23a65223ab10528219c.tar nixlib-cdd40ba79e7eca9674bdb23a65223ab10528219c.tar.gz nixlib-cdd40ba79e7eca9674bdb23a65223ab10528219c.tar.bz2 nixlib-cdd40ba79e7eca9674bdb23a65223ab10528219c.tar.lz nixlib-cdd40ba79e7eca9674bdb23a65223ab10528219c.tar.xz nixlib-cdd40ba79e7eca9674bdb23a65223ab10528219c.tar.zst nixlib-cdd40ba79e7eca9674bdb23a65223ab10528219c.zip |
colord: 1.2.12 → 1.4.1
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/misc/colord/default.nix | 43 | ||||
-rw-r--r-- | pkgs/tools/misc/colord/fix-build-paths.patch | 56 |
2 files changed, 74 insertions, 25 deletions
diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index 40ea672296d8..020599e17a81 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -1,51 +1,44 @@ { stdenv, fetchurl, bash-completion -, glib, polkit, pkgconfig, intltool, gusb, libusb1, lcms2, sqlite, systemd, dbus -, gtk_doc, gobjectIntrospection, argyllcms, autoreconfHook +, glib, polkit, pkgconfig, gettext, gusb, lcms2, sqlite, systemd, dbus +, gobjectIntrospection, argyllcms, meson, ninja, libxml2, vala_0_38 , libgudev, sane-backends }: stdenv.mkDerivation rec { - name = "colord-1.2.12"; + name = "colord-1.4.1"; src = fetchurl { url = "http://www.freedesktop.org/software/colord/releases/${name}.tar.xz"; - sha256 = "0flcsr148xshjbff030pgyk9ar25an901m9q1pjgjdvaq5j1h96m"; + sha256 = "0m854clp8szvq38z16jpazzlqfb3lb3icxcfnsisfrc25748y1ib"; }; enableParallelBuilding = true; - # Version mismatch requires intltoolize to overwrite - # with newer version. - preConfigure = '' - intltoolize --force - ''; - - configureFlags = [ - "--enable-sane" - "--with-udevrulesdir=$(out)/lib/udev/rules.d" - "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + mesonFlags = [ + "-Denable-sane=true" + "-Denable-vala=true" "--localstatedir=/var" - "--disable-bash-completion" + "-Denable-bash-completion=true" + # TODO: man page cannot be build with docbook2x + "-Denable-man=false" + "-Denable-docs=false" ]; + patches = [ + ./fix-build-paths.patch + ]; - # don't touch /var at install time, colord creates what it needs at runtime - postPatch = '' - sed -e "s|if test -w .*;|if false;|" -i src/Makefile.{am,in} - ''; - - nativeBuildInputs = [ autoreconfHook intltool pkgconfig ]; + nativeBuildInputs = [ meson pkgconfig vala_0_38 ninja gettext libxml2 gobjectIntrospection ]; - buildInputs = [ glib polkit gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection + buildInputs = [ glib polkit gusb lcms2 sqlite systemd dbus bash-completion argyllcms libgudev sane-backends ]; postInstall = '' - mkdir -p $out/etc/bash_completion.d - cp -v data/colormgr $out/etc/bash_completion.d + glib-compile-schemas $out/share/glib-2.0/schemas ''; meta = { description = "System service to manage, install and generate color profiles to accurately color manage input and output devices"; - homepage = http://www.freedesktop.org/software/colord/intro.html; + homepage = https://www.freedesktop.org/software/colord/; license = stdenv.lib.licenses.lgpl2Plus; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/misc/colord/fix-build-paths.patch b/pkgs/tools/misc/colord/fix-build-paths.patch new file mode 100644 index 000000000000..7eb66a0b34be --- /dev/null +++ b/pkgs/tools/misc/colord/fix-build-paths.patch @@ -0,0 +1,56 @@ +--- a/contrib/session-helper/meson.build ++++ b/contrib/session-helper/meson.build +@@ -21,7 +21,7 @@ + output : 'colord-session.service', + configuration : con2, + install: true, +- install_dir: systemd.get_pkgconfig_variable('systemduserunitdir'), ++ install_dir: join_paths(get_option('prefix'), 'etc', 'systemd', 'user'), + ) + endif + +--- a/data/meson.build ++++ b/data/meson.build +@@ -8,13 +8,13 @@ + + if get_option('enable-systemd') + install_data('colord.conf', +- install_dir: systemd.get_pkgconfig_variable('tmpfilesdir') ++ install_dir: join_paths(get_option('prefix'), 'lib', 'tmpfiles.d') + ) + endif + + if get_option('enable-bash-completion') + install_data('colormgr', +- install_dir: bash_completion.get_pkgconfig_variable('completionsdir') ++ install_dir: join_paths(get_option('prefix'), 'etc', 'bash_completion.d') + ) + endif + +@@ -31,7 +31,7 @@ + output : 'colord.service', + configuration : con2, + install: true, +- install_dir: systemd.get_pkgconfig_variable('systemdsystemunitdir'), ++ install_dir: join_paths(get_option('prefix'), 'etc', 'systemd', 'system'), + ) + endif + +--- a/meson.build ++++ b/meson.build +@@ -258,6 +258,3 @@ + subdir('policy') + subdir('rules') + subdir('src') +- +-meson.add_install_script('meson_post_install.sh', +- localstatedir, get_option('with-daemon-user')) +--- a/rules/meson.build ++++ b/rules/meson.build +@@ -9,5 +9,5 @@ + sensor_rules_in, + '95-cd-devices.rules', + ], +- install_dir : join_paths(udev.get_pkgconfig_variable('udevdir'), 'rules.d') ++ install_dir : join_paths(get_option('prefix'), 'lib', 'udev', 'rules.d') + ) |