From 745472d66aa66cf42820e03d4d399c026508399c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 19 Jan 2014 23:14:11 +0100 Subject: [PATCH] Add gnome3.gnome_settings_daemon --- .../core/gnome-settings-daemon/default.nix | 35 ++++++++++++++ pkgs/desktops/gnome-3/default.nix | 2 + .../libraries/json-glib/default.nix | 15 +++--- .../libraries/libwacom/default.nix | 19 ++++++++ pkgs/tools/misc/colord/default.nix | 48 +++++-------------- pkgs/top-level/all-packages.nix | 2 + 6 files changed, 78 insertions(+), 43 deletions(-) create mode 100644 pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix create mode 100644 pkgs/development/libraries/libwacom/default.nix diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix new file mode 100644 index 000000000000..cce0ff46ca0b --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix @@ -0,0 +1,35 @@ +{ fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst +, libxkbfile, pulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit +, geoclue2, librsvg, xf86_input_wacom, udev, libwacom, libxslt, libtool +, docbook_xsl, docbook_xsl_ns, makeWrapper }: + +stdenv.mkDerivation rec { + name = "gnome-settings-daemon-3.10.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-settings-daemon/3.10/${name}.tar.xz"; + sha256 = "0r42lzlgk0w40ws4d3s7yayn6n8zqlnh5b6k88gvgv1lwk39k240"; + }; + + configureFlags = "--disable-ibus"; + + # fatal error: gio/gunixfdlist.h: No such file or directory + NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0"; + + buildInputs = with gnome3; + [ intltool pkgconfig gtk glib gsettings_desktop_schemas libnotify gnome_desktop + lcms2 libXtst libxkbfile pulseaudio libcanberra_gtk3 upower colord libgweather + polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libwacom libxslt + libtool docbook_xsl docbook_xsl_ns makeWrapper ]; + + postInstall = '' + wrapProgram "$out/libexec/gnome-settings-daemon-localeexec" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --prefix XDG_DATA_DIRS : "${gnome3.gtk}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share" + ''; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; + +} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 913a94b85e38..d50dcc8a6229 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -41,6 +41,8 @@ rec { gnome_session = callPackage ./core/gnome-session { }; + gnome_settings_daemon = callPackage ./core/gnome-settings-daemon { }; + gnome_terminal = callPackage ./core/gnome-terminal { }; gnome_themes_standard = callPackage ./core/gnome-themes-standard { }; diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index 005b9fac2e55..1380cec86ae5 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -1,18 +1,21 @@ -{ stdenv, fetchurl_gnome, glib, pkgconfig, gobjectIntrospection }: +{ stdenv, fetchurl_gnome, glib, pkgconfig, gobjectIntrospection, dbus }: stdenv.mkDerivation rec { name = src.pkgname; src = fetchurl_gnome { project = "json-glib"; - major = "0"; minor = "14"; patchlevel = "2"; extension = "xz"; - sha256 = "19wlpsbdnm3mq2a6yjpzj0cwrmlkarp2m5x6g63b0r2n7vxaa5mq"; + major = "0"; + minor = "16"; + patchlevel = "2"; + extension = "xz"; + sha256 = "0b22yw0n87mg7a5lkqw1d7xqnm8qj1bwy0wklv9b2yn29qv7am59"; }; - configureflags= " --with-introspection " ; + configureflags= "--with-introspection" ; - propagatedBuildInputs = [ glib ]; - nativeBuildInputs = [ pkgconfig gobjectIntrospection]; + propagatedBuildInputs = [ glib gobjectIntrospection ]; + nativeBuildInputs = [ pkgconfig ]; meta = { homepage = http://live.gnome.org/JsonGlib; diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix new file mode 100644 index 000000000000..f6244cba5cb1 --- /dev/null +++ b/pkgs/development/libraries/libwacom/default.nix @@ -0,0 +1,19 @@ +{ fetchurl, stdenv, glib, pkgconfig, udev }: + +stdenv.mkDerivation rec { + name = "libwacom-0.7.1"; + + src = fetchurl { + url = "mirror://sourceforge/linuxwacom/libwacom/${name}.tar.bz2"; + sha256 = "1agdaa1bv5mp4l32qgsw63swnnv0p279jiy9madgw4y3d8d12dwm"; + }; + + buildInputs = [ glib pkgconfig udev ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + homepage = http://sourceforge.net/projects/linuxwacom/; + description = "libraries, configuration, and diagnostic tools for Wacom tablets running under Linux"; + }; + +} 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"; - }; + src = fetchurl { + url = "http://www.freedesktop.org/software/colord/releases/${name}.tar.xz"; + sha256 = "1638pfv16bdrdxxprk6dp8d706571a8i3nlfv3m0ldx26xpy8z5j"; }; - "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 ]; - }; -} { 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; }; -}) +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f13dde8cd86..eb1f6eadf5d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5220,6 +5220,8 @@ let ccrtp = ccrtp_1_8; }; + libwacom = callPackage ../development/libraries/libwacom { }; + lightning = callPackage ../development/libraries/lightning { }; lirc = callPackage ../development/libraries/lirc { };