about summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorYury G. Kudryashov <urkud.urkud@gmail.com>2012-03-17 16:45:50 +0000
committerYury G. Kudryashov <urkud.urkud@gmail.com>2012-03-17 16:45:50 +0000
commit60669aa0fc299ccbf0a09f7e696757767db391dd (patch)
tree1e7b981b12db73a64b2491d7512a3caf258ab3c0 /pkgs/desktops
parenteee4797659e39a4e085c48ec9a59d6944add37a2 (diff)
downloadnixlib-60669aa0fc299ccbf0a09f7e696757767db391dd.tar
nixlib-60669aa0fc299ccbf0a09f7e696757767db391dd.tar.gz
nixlib-60669aa0fc299ccbf0a09f7e696757767db391dd.tar.bz2
nixlib-60669aa0fc299ccbf0a09f7e696757767db391dd.tar.lz
nixlib-60669aa0fc299ccbf0a09f7e696757767db391dd.tar.xz
nixlib-60669aa0fc299ccbf0a09f7e696757767db391dd.tar.zst
nixlib-60669aa0fc299ccbf0a09f7e696757767db391dd.zip
Remove gnome3.glib_networking
Use pkgs.glib_networking

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33199
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/gnome-3/default.nix2
-rw-r--r--pkgs/desktops/gnome-3/platform/glib-networking.nix23
2 files changed, 0 insertions, 25 deletions
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 2c274c55a623..d49fca175219 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -3,8 +3,6 @@
 {
   clutter = callPackage ./platform/clutter.nix { };
 
-  glib_networking = callPackage ./platform/glib-networking.nix { };
-
   libgnome_keyring = callPackage ./platform/libgnome-keyring.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
deleted file mode 100644
index 37537b274e14..000000000000
--- a/pkgs/desktops/gnome-3/platform/glib-networking.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, fetchurl, glib, pkgconfig, intltool, gnutls, libgcrypt
-, gsettings_desktop_schemas }:
-
-stdenv.mkDerivation {
-  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 = [ pkgconfig intltool ];
-
-  configureFlags = "--without-ca-certificates";
-  postConfigure = "export makeFlags=GIO_MODULE_DIR=$out/${glib.gioModuleDir}";
-
-  meta = {
-    TODO = "Look at `--without-ca-certificates` again";
-    inherit (glib.meta) platforms maintainers;
-  };
-}