Merge remote-tracking branch 'upstream/staging' into deps-reorg

2017-09-28 12:32:57 -04:00
parent f08d6f0e2d 4e22e88b91
commit f037625f87
789 changed files with 15725 additions and 8096 deletions
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
    sha256 = "1kbgqh7bw0fdx4f1a1aqwpff7gp5mwhbaz60c6c98bc4djng5dgs";
  };

+  outputs = [ "out" "dev" ];
+
  nativeBuildInputs = [ pkgconfig intltool ];
  buildInputs = [ bison popt gtk libxml2 GConf libglade libtool ];
  propagatedBuildInputs = [ libbonobo libgnomecanvas libgnome ];
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
    sha256 = "03rwbli76crkjl6gp422wrc9lqpl174k56cp9i96b7l8jlj2yddf";
  };

+  outputs = [ "out" "dev" ];
+
  nativeBuildInputs = [ pkgconfig intltool ];
  buildInputs =
    [ xorg.xlibsWrapper libxml2 GConf pango glib libgnome_keyring libglade libtool ];