Author: urkud
Date: Fri Jan 6 18:12:38 2012
New Revision: 31356
URL: https://nixos.org/websvn/nix/?rev=31356&sc=1
Log:
Add gnome3.{glib_networking,gsettings_desktop_schemas}
Cherry-pick from stdenv-updates
Added:
nixpkgs/trunk/pkgs/desktops/gnome-3/platform/glib-networking.nix
nixpkgs/trunk/pkgs/desktops/gnome-3/platform/gsettings-desktop-schemas.nix
Modified:
nixpkgs/trunk/pkgs/desktops/gnome-3/default.nix
Modified: nixpkgs/trunk/pkgs/desktops/gnome-3/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/gnome-3/default.nix Fri Jan 6 17:45:53
2012 (r31355)
+++ nixpkgs/trunk/pkgs/desktops/gnome-3/default.nix Fri Jan 6 18:12:38
2012 (r31356)
@@ -4,5 +4,9 @@
# Ensure that we use dbus-glib built with gtkLibs3x.glib
dbus_glib = callPackage ../../development/libraries/dbus-glib { };
+ glib_networking = callPackage ./platform/glib-networking.nix {};
+
+ gsettings_desktop_schemas = callPackage
./platform/gsettings-desktop-schemas.nix {};
+
GConf = callPackage ./platform/GConf.nix { };
}
Added: nixpkgs/trunk/pkgs/desktops/gnome-3/platform/glib-networking.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/gnome-3/platform/glib-networking.nix Fri Jan
6 18:12:38 2012 (r31356)
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, glib, xz, pkgconfig, intltool, gnutls, libgcrypt
+, gsettings_desktop_schemas }:
+
+stdenv.mkDerivation rec {
+ name = "glib-networking-2.30.2";
+
+ src = fetchurl {
+ url =
mirror://gnome/sources/glib-networking/2.30/glib-networking-2.30.2.tar.xz;
+ sha256 = "1g2ran0rn37009fs3xl38m95i5w8sdf9ax0ady4jbjir15844xcz";
+ };
+
+ propagatedBuildInputs = [ glib gnutls libgcrypt ];
+ buildInputs = [ gsettings_desktop_schemas ];
+ buildNativeInputs = [ xz pkgconfig intltool ];
+
+ configureFlags = "--without-ca-certificates";
+ postConfigure = "export makeFlags=GIO_MODULE_DIR=$out/${glib.gioModuleDir}";
+
+ meta = {
+ TODO = "Look at `--without-ca-certificates` again";
+ };
+}
Added:
nixpkgs/trunk/pkgs/desktops/gnome-3/platform/gsettings-desktop-schemas.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/gnome-3/platform/gsettings-desktop-schemas.nix
Fri Jan 6 18:12:38 2012 (r31356)
@@ -0,0 +1,13 @@
+{ stdenv, fetchurl, xz, glib, pkgconfig, intltool }:
+
+stdenv.mkDerivation rec {
+ name = "gsettings-desktop-schemas-3.2.0";
+
+ src = fetchurl {
+ url =
mirror://gnome/sources/gsettings-desktop-schemas/3.2/gsettings-desktop-schemas-3.2.0.tar.xz;
+ sha256 = "0772axkd1nlf3j1lcg0zi5x5jh4zmr25k98dhn7pzppahljaj3hi";
+ };
+
+ buildInputs = [ glib ];
+ buildNativeInputs = [ pkgconfig xz intltool ];
+}
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
