diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-06 09:41:43 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-06 09:41:43 +0000 |
| commit | 0b90cd41b2fe467f53d9a082c91e6f6438ba6a2b (patch) | |
| tree | cba2aa21df776b37749d77ab9af31bda1a7d3c34 /pkgs | |
| parent | 10fd822319356efcc5bc3fa71a56894824541ec5 (diff) | |
| download | nixpkgs-0b90cd41b2fe467f53d9a082c91e6f6438ba6a2b.tar nixpkgs-0b90cd41b2fe467f53d9a082c91e6f6438ba6a2b.tar.gz nixpkgs-0b90cd41b2fe467f53d9a082c91e6f6438ba6a2b.tar.bz2 nixpkgs-0b90cd41b2fe467f53d9a082c91e6f6438ba6a2b.tar.lz nixpkgs-0b90cd41b2fe467f53d9a082c91e6f6438ba6a2b.tar.xz nixpkgs-0b90cd41b2fe467f53d9a082c91e6f6438ba6a2b.tar.zst nixpkgs-0b90cd41b2fe467f53d9a082c91e6f6438ba6a2b.zip | |
Add gnome3.{glib_networking,gsettings_desktop_schemas}
svn path=/nixpkgs/branches/stdenv-updates/; revision=31340
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/desktops/gnome-3/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/platform/glib-networking.nix | 22 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/platform/gsettings-desktop-schemas.nix | 13 |
3 files changed, 39 insertions, 0 deletions
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index b82ca22d94f..30ce2f6abcc 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -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 { }; } diff --git a/pkgs/desktops/gnome-3/platform/glib-networking.nix b/pkgs/desktops/gnome-3/platform/glib-networking.nix new file mode 100644 index 00000000000..ed28306d510 --- /dev/null +++ b/pkgs/desktops/gnome-3/platform/glib-networking.nix @@ -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"; + }; +} diff --git a/pkgs/desktops/gnome-3/platform/gsettings-desktop-schemas.nix b/pkgs/desktops/gnome-3/platform/gsettings-desktop-schemas.nix new file mode 100644 index 00000000000..1d099d3dea3 --- /dev/null +++ b/pkgs/desktops/gnome-3/platform/gsettings-desktop-schemas.nix @@ -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 ]; +} |