2 files changed, 5 insertions, 39 deletions
diff --git a/pkgs/development/libraries/glib/2.20.x.nix b/pkgs/development/libraries/glib/2.20.x.nix
deleted file mode 100644
index c7a92a00b42c..000000000000
--- a/pkgs/development/libraries/glib/2.20.x.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gettext, perl }:
-
-stdenv.mkDerivation rec {
-  name = "glib-2.20.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/glib/2.20/${name}.tar.bz2";
-    sha256 = "0ndgshcqzpj3piwmag3vrsv3rg4pnr12y70knl7z0k2i03cy5bav";
-  };
-
-  buildNativeInputs = [perl];
-  buildInputs = [pkgconfig gettext];
-
-  # The nbd package depends on a static version of this library; hence
-  # the default configure flag --disable-static is switched off.
-  dontDisableStatic = true;
-  configureFlags = "--enable-static --enable-shared";
-
-  meta = {
-    description = "GLib, a C library of programming buildings blocks";
-
-    longDescription = ''
-      GLib provides the core application building blocks for libraries
-      and applications written in C.  It provides the core object
-      system used in GNOME, the main loop implementation, and a large
-      set of utility functions for strings and common data structures.
-    '';
-
-    homepage = http://www.gtk.org/;
-
-    license = "LGPLv2+";
-  };
-}
diff --git a/pkgs/development/libraries/glib/2.30.x.nix b/pkgs/development/libraries/glib/2.30.x.nix
index 25f8abfeb0a5..a0d8ac0eff7b 100644
--- a/pkgs/development/libraries/glib/2.30.x.nix
+++ b/pkgs/development/libraries/glib/2.30.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl_gnome, pkgconfig, gettext, perl, libiconv, zlib, xz, libffi
+{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconv, zlib, xz, libffi
 , python }:
 
 # TODO:
@@ -12,12 +12,11 @@
 #       $out/bin/gtester-report' to postInstall if this is solved
 
 stdenv.mkDerivation rec {
-  name = src.pkgname;
+  name = "glib-2.30.2";
 
-  src = fetchurl_gnome {
-    project = "glib";
-    major = "2"; minor = "30"; patchlevel = "0"; extension = "xz";
-    sha256 = "1hfdnxf5hsfhkd54390lnc1b14m9n7y031fpma4vpsh96js00k6n";
+  src = fetchurl {
+    url = mirror://gnome/sources/glib/2.30/glib-2.30.2.tar.xz;
+    sha256 = "10lfzxwc45lh5vfnd33l4m9z1mf3arpwdd8jz94dn79j6diixsgh";
   };
 
   # configure script looks for d-bus but it is only needed for tests