diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-01-20 19:39:28 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-01-20 19:39:28 +0100 |
commit | ac6761c9081134baaa7dae18f06cbfaca38270d5 (patch) | |
tree | a1ff0e93e8907624d65aff367496513d3dc47374 /pkgs/tools/misc | |
parent | 177667eea987898097e854a54962ff90bbf4fa35 (diff) | |
parent | 8088837dc8f35ef7853787f88bb1db7248900cc4 (diff) | |
download | nixlib-ac6761c9081134baaa7dae18f06cbfaca38270d5.tar nixlib-ac6761c9081134baaa7dae18f06cbfaca38270d5.tar.gz nixlib-ac6761c9081134baaa7dae18f06cbfaca38270d5.tar.bz2 nixlib-ac6761c9081134baaa7dae18f06cbfaca38270d5.tar.lz nixlib-ac6761c9081134baaa7dae18f06cbfaca38270d5.tar.xz nixlib-ac6761c9081134baaa7dae18f06cbfaca38270d5.tar.zst nixlib-ac6761c9081134baaa7dae18f06cbfaca38270d5.zip |
Merge master into stdenv-updates
Conflicts: pkgs/applications/version-management/gource/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r-- | pkgs/tools/misc/colord/default.nix | 48 |
1 files changed, 11 insertions, 37 deletions
diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index e6787ec76c8a..525c3ba9f2c4 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -1,50 +1,24 @@ -{ stdenv, fetchurl, fetchgit +{ stdenv, fetchurl, fetchgit, bashCompletion , glib, polkit, pkgconfig, intltool, gusb, libusb1, lcms2, sqlite, systemd, dbus +, automake, autoconf, libtool, gtk_doc, which, gobjectIntrospection }: -, automake, autoconf, libtool, gtk_doc, which, gobjectIntrospection -, version ? "git" -}: +stdenv.mkDerivation rec { + name = "colord-1.1.5"; -# colord wants to write to the etc/colord.conf and var/run/colord/mapping.db -# thus they get symlinked to /etc and /var - -stdenv.mkDerivation (stdenv.lib.mergeAttrsByVersion "colord" version { - "0.1.33" = { - name = "colord-0.1.33"; - src = fetchurl { - url = http://www.freedesktop.org/software/colord/releases/colord-0.1.32.tar.xz; - sha256 = "1smbkh4z1c2jjwxg626f12sslv7ff3yzak1zqrc493cl467ll0y7"; - }; - }; - "git" = { - name = "colord-git-11dca"; - src = fetchgit { - url = "https://github.com/hughsie/colord.git"; - rev = "11dcaba034edff3955ceff53795df82c57c34adc"; - sha256 = "1280q7zbfm5wqql872kcxmk5rmwjs7cv7cgz8nx0i9g4ac8j2mrf"; - }; - - preConfigure = '' - ./autogen.sh - ''; - buildInputs = [ automake autoconf libtool gtk_doc which gobjectIntrospection ]; + src = fetchurl { + url = "http://www.freedesktop.org/software/colord/releases/${name}.tar.xz"; + sha256 = "1638pfv16bdrdxxprk6dp8d706571a8i3nlfv3m0ldx26xpy8z5j"; }; -} { enableParallelBuilding = true; - preConfigure = '' - configureFlags="$configureFlags --with-udevrulesdir=$out/lib/udev/rules.d --with-systemdsystemunitdir=$out/lib/udev/rules.d" - ''; + configureFlags = "--with-udevrulesdir=$out/lib/udev/rules.d --with-systemdsystemunitdir=$out/lib/udev/rules.d --disable-bash-completion"; - buildInputs = [glib polkit pkgconfig intltool gusb libusb1 lcms2 sqlite systemd dbus]; + buildInputs = [ glib polkit pkgconfig intltool gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection + bashCompletion ]; postInstall = '' - sed -i '/usb_id\|usb-db/d' $out/lib/udev/rules.d/69-cd-sensors.rules - mv $out/etc/colord.conf{,.default} - ln -s /etc/colord.conf $out/etc/colord.conf rm -fr $out/var/lib/colord - ln -s /var/lib/colord $out/var/lib/colord ''; meta = { @@ -54,4 +28,4 @@ stdenv.mkDerivation (stdenv.lib.mergeAttrsByVersion "colord" version { maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; }; -}) +} |