summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorYury G. Kudryashov <urkud.urkud@gmail.com>2012-03-08 16:49:08 +0000
committerYury G. Kudryashov <urkud.urkud@gmail.com>2012-03-08 16:49:08 +0000
commit1a62d14cdd99126ac407bb2a54f6dde862863803 (patch)
treef300f45c0e1b2e595c2dd132a0070ebfcf640dce /pkgs/desktops
parent46b258acb4e0f8566f77acbe3567043f434f6c43 (diff)
downloadnixlib-1a62d14cdd99126ac407bb2a54f6dde862863803.tar
nixlib-1a62d14cdd99126ac407bb2a54f6dde862863803.tar.gz
nixlib-1a62d14cdd99126ac407bb2a54f6dde862863803.tar.bz2
nixlib-1a62d14cdd99126ac407bb2a54f6dde862863803.tar.lz
nixlib-1a62d14cdd99126ac407bb2a54f6dde862863803.tar.xz
nixlib-1a62d14cdd99126ac407bb2a54f6dde862863803.tar.zst
nixlib-1a62d14cdd99126ac407bb2a54f6dde862863803.zip
Move glib-networking to top namespace
svn path=/nixpkgs/trunk/; revision=32905
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/gnome-2/default.nix2
-rw-r--r--pkgs/desktops/gnome-2/platform/glib-networking/default.nix24
2 files changed, 0 insertions, 26 deletions
diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix
index 814b054f74e7..f0c1006a1265 100644
--- a/pkgs/desktops/gnome-2/default.nix
+++ b/pkgs/desktops/gnome-2/default.nix
@@ -60,8 +60,6 @@
 
   at_spi = callPackage ./platform/at-spi { };
 
-  glib_networking = callPackage ./platform/glib-networking { };
-
   gtk_doc = callPackage ./platform/gtk-doc { };
 
   gtkhtml = callPackage ./platform/gtkhtml { };
diff --git a/pkgs/desktops/gnome-2/platform/glib-networking/default.nix b/pkgs/desktops/gnome-2/platform/glib-networking/default.nix
deleted file mode 100644
index 53ab1ba08406..000000000000
--- a/pkgs/desktops/gnome-2/platform/glib-networking/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{stdenv, fetchurl, pkgconfig, glib, libtool, intltool, gnutls2, libproxy
-  , libgcrypt, libtasn1
-  }:
-
-stdenv.mkDerivation {
-  name = "glib-networking-2.28.5";
-  
-  src = fetchurl {
-    url = mirror://gnome/sources/glib-networking/2.28/glib-networking-2.28.5.tar.bz2;
-    sha256 = "959ffeb91fee17c1b0fb2aa82872c3daae0230de93708b2ebabeb92b747d7876";
-  };
-
-  configureFlags = [
-    "--without-ca-certificates"
-  ];
-  
-  preBuild = ''
-    sed -e "s@${glib}/lib/gio/modules@$out/lib/gio/modules@g" -i $(find . -name Makefile)
-  '';
-
-  buildInputs = [ pkgconfig ];
-  propagatedBuildInputs = [ glib libtool intltool gnutls2 libproxy libgcrypt 
-    libtasn1];
-}