mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 13:10:33 +00:00
Code Issues Wiki Activity

changes in: redshift, geoclue, libsoup

Browse source 
- added support for geoclue for redshift
 - package geoclue 2.0.0 (as geoclue2)
 - package libsoup 2.44.1 (as libsoup_2_40)
This commit is contained in:
Rok Garbas 2013-10-29 16:23:24 +01:00
parent 89b1dd8dde
commit b040814679
4 changed files with 72 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/misc/redshift/default.nix
View file

@ -1,6 +1,6 @@
{ fetchurl, stdenv, libX11, libXrandr, libXxf86vm, libxcb, pkgconfig, python
, randrproto, xcbutil, xf86vidmodeproto, autoconf, automake, gettext, glib
, GConf, dbus, dbus_glib, makeWrapper, gtk, pygtk, pyxdg }:
, GConf, dbus, dbus_glib, makeWrapper, gtk, pygtk, pyxdg, geoclue }:
stdenv.mkDerivation rec {
version = "1.8";
@ -13,9 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [
libX11 libXrandr libXxf86vm libxcb pkgconfig python randrproto xcbutil
xf86vidmodeproto autoconf automake gettext glib GConf dbus dbus_glib
makeWrapper gtk pygtk pyxdg
# TODO:
# geoclue
makeWrapper gtk pygtk pyxdg geoclue
];
preConfigure = ''

30
pkgs/development/libraries/geoclue/2.0.nix Normal file
View file

@ -0,0 +1,30 @@
{ fetchurl, stdenv, intltool, pkgconfig, glib, json_glib, libsoup, geoip
, dbus, dbus_glib
}:
stdenv.mkDerivation rec {
name = "geoclue-2.0.0";
src = fetchurl {
url = "http://www.freedesktop.org/software/geoclue/releases/2.0/${name}.tar.xz";
sha256 = "18b7ikdcw2rm04gzw82216shp5m9pghvnsddw233s5jswn2g30ja";
};
buildInputs =
[ intltool pkgconfig glib json_glib libsoup geoip
dbus dbus_glib
];
preConfigure = ''
substituteInPlace configure --replace "-Werror" ""
'';
propagatedBuildInputs = [ dbus dbus_glib glib ];
meta = {
description = "Geolocation framework and some data providers";
maintainers = with stdenv.lib.maintainers; [ raskin garbas ];
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.lgpl2;
};
}

32
pkgs/development/libraries/libsoup/2.40.nix Normal file
View file

@ -0,0 +1,32 @@
{ stdenv, fetchurl, pkgconfig, glib, libxml2, sqlite, intltool, python
, gnomeSupport ? true, libgnome_keyring, glib_networking
}:
stdenv.mkDerivation {
name = "libsoup-2.44.1";
src = fetchurl {
url = mirror://gnome/sources/libsoup/2.44/libsoup-2.44.1.tar.xz;
sha256 = "07acjwvik3gagcsdjzi85g44ga4pd3nh4ww6722bfzjzvlqw6cn5";
};
preConfigure = ''
substituteInPlace libsoup/tld-parser.py \
--replace "!/usr/bin/env python" "!${python}/bin/${python.executable}"
'';
buildInputs = [ pkgconfig intltool python ];
nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ glib libxml2 sqlite ]
++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring ];
passthru.propagatedUserEnvPackages = [ glib_networking ];
# glib_networking is a runtime dependency, not a compile-time dependency
configureFlags = "--disable-tls-check";
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
meta = {
# inherit (glib.meta) maintainers platforms;
};
}

12
pkgs/top-level/all-packages.nix
View file

@ -4158,6 +4158,10 @@ let
geoclue = callPackage ../development/libraries/geoclue {};
geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix {
libsoup = libsoup_2_40;
};
geoip = builderDefsPackage ../development/libraries/geoip {
inherit zlib;
};
@ -5002,6 +5006,7 @@ let
libsodium = callPackage ../development/libraries/libsodium { };
libsoup = callPackage ../development/libraries/libsoup { };
libsoup_2_40 = callPackage ../development/libraries/libsoup/2.40.nix { };
libssh = callPackage ../development/libraries/libssh { };
@ -5750,8 +5755,7 @@ let
inherit (gnome) gtkdoc libsoup;
inherit pkgconfig libtool intltool autoconf automake gperf bison flex
libjpeg libpng libtiff libxml2 libxslt sqlite icu curl
which libproxy geoclue enchant python ruby perl
mesa xlibs;
which libproxy geoclue enchant python ruby perl mesa xlibs;
inherit gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good;
};
@ -5761,8 +5765,7 @@ let
inherit (gnome) gtkdoc libsoup;
inherit pkgconfig libtool intltool autoconf automake gperf bison flex
libjpeg libpng libtiff libxml2 libxslt sqlite icu curl
which libproxy geoclue enchant python ruby perl
mesa xlibs;
which libproxy geoclue enchant python ruby perl mesa xlibs;
inherit gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good;
};
@ -9616,6 +9619,7 @@ let
xf86vidmodeproto;
inherit (gnome) GConf;
inherit (pythonPackages) pyxdg;
geoclue = geoclue2;
};
oxygen_gtk = callPackage ../misc/themes/gtk2/oxygen-gtk { };