Merge commit 'refs/pull/18498/head' of git://github.com/NixOS/nixpkgs

2016-09-13 12:51:34 +03:00
parent 9c47876b84 a769e0ffae
commit 4748709926
340 changed files with 898 additions and 873 deletions
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, libtool, which, gnome, glib,
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool, which, gnome2, glib,
  pkgconfig, gobjectIntrospection }:

 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
  };

  buildInputs = [
-    which autoconf automake libtool gnome.gtkdoc glib pkgconfig
+    which autoconf automake libtool gnome2.gtkdoc glib pkgconfig
    gobjectIntrospection
  ];