Merge branch 'master'

This commit is contained in:
Vladimír Čunát
2018-03-05 14:53:27 +01:00
1666 changed files with 26733 additions and 31238 deletions
@@ -1,4 +1,7 @@
{ stdenv, fetchurl, pkgconfig, gtk2, bison, intltool, flex, netpbm, imagemagick, dbus, xlibsWrapper, libGLU_combined, shared_mime_info, tcl, tk, gnome2, pangox_compat, gd, xorg }:
{ stdenv, fetchurl, pkgconfig, gtk2, bison, intltool, flex
, netpbm, imagemagick, dbus, xlibsWrapper, libGLU_combined
, shared-mime-info, tcl, tk, gnome2, pangox_compat, gd, xorg
}:
stdenv.mkDerivation rec {
name = "pcb-${version}";
@@ -10,7 +13,11 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk2 bison intltool flex netpbm imagemagick dbus xlibsWrapper libGLU_combined tcl shared_mime_info tk gnome2.gtkglext pangox_compat gd xorg.libXmu ];
buildInputs = [
gtk2 bison intltool flex netpbm imagemagick dbus xlibsWrapper
libGLU_combined tcl shared-mime-info tk
gnome2.gtkglext pangox_compat gd xorg.libXmu
];
configureFlags = ["--disable-update-desktop-database"];