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
@@ -5,7 +5,7 @@
 , libxml2
 , pciutils
 , pkgconfig
-, gtk
+, gtk2
 }:

 let version = "20061014"; in
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
      libxml2
      pciutils
      pkgconfig
-      gtk
+      gtk2
    ];

  meta = with stdenv.lib; {