pcb: 20140316 → 4.2.0

* Long overdue update
* Clean up the expression
* Drop unneeded pangox_compat – it was probably needed before gtkglext propagated it.

pkgs/applications/science/electronics/pcb/default.nix

@@ -1,25 +1,59 @@
-{ stdenv, fetchurl, pkgconfig, gtk2, bison, intltool, flex
+{ stdenv
-, netpbm, imagemagick, dbus, xlibsWrapper, libGLU, libGL
+, fetchurl
-, shared-mime-info, tcl, tk, gnome2, pangox_compat, gd, xorg
+, pkgconfig
+, gtk2
+, bison
+, intltool
+, flex
+, netpbm
+, imagemagick
+, dbus
+, xlibsWrapper
+, libGLU
+, libGL
+, shared-mime-info
+, tcl
+, tk
+, gnome2
+, gd
+, xorg
 }:
 
 stdenv.mkDerivation rec {
   pname = "pcb";
-  version = "20140316";
+  version = "4.2.0";
 
   src = fetchurl {
-    url = "http://ftp.geda-project.org/pcb/pcb-20140316/${pname}-${version}.tar.gz";
+    url = "mirror://sourceforge/pcb/${pname}-${version}.tar.gz";
-    sha256 = "0l6944hq79qsyp60i5ai02xwyp8l47q7xdm3js0jfkpf72ag7i42";
+    sha256 = "0hwsqmcrnk4wipbmfqx1yckmmgfn8vr37d1gh5srfy27czgkcjyd";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [
-  buildInputs = [
+    pkgconfig
-    gtk2 bison intltool flex netpbm imagemagick dbus xlibsWrapper
+    bison
-    libGLU libGL tcl shared-mime-info tk
+    intltool
-    gnome2.gtkglext pangox_compat gd xorg.libXmu
+    flex
+    netpbm
+    imagemagick
   ];
 
-  configureFlags = ["--disable-update-desktop-database"];
+  buildInputs = [
+    gtk2
+    dbus
+    xlibsWrapper
+    libGLU
+    libGL
+    tcl
+    shared-mime-info
+    tk
+    gnome2.gtkglext
+    gd
+    xorg.libXmu
+  ];
+
+  configureFlags = [
+    "--disable-update-desktop-database"
+  ];
 
   meta = with stdenv.lib; {
     description = "Printed Circuit Board editor";