fltk-1.3.0

svn path=/nixpkgs/trunk/; revision=31223

pkgs/development/libraries/fltk/fltk11.nix pkgs/development/libraries/fltk/fltk13.nix

···
 
 let inherit (composableDerivation) edf; in
 
+let version = "1.3.0"; in
 composableDerivation.composableDerivation {} {
-  name = "fltk-1.1.10";
+  name = "fltk-${version}";
 
   src = fetchurl {
-    url = http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/1.1.10/fltk-1.1.10-source.tar.bz2;
-    sha256 = "16mic69a48y3ybijml754x38djxxb25rn8441p9qsssqy8ms5b9p";
+    url = "ftp://ftp.easysw.com/pub/fltk/${version}/fltk-${version}-source.tar.gz";
+    sha256 = "075j6ljx4dfg9rnkardn24y0f26ylpakm0yylg6a9kllha07c1lr";
   };
 
   propagatedBuildInputs = [ x11 inputproto libXi freeglut ];
 
-  buildInputs = [ pkgconfig ];
+  buildNativeInputs = [ pkgconfig ];
 
   flags =
     # this could be tidied up (?).. eg why does it require freeglut without glSupport?

pkgs/top-level/all-packages.nix

···
 
   flite = callPackage ../development/libraries/flite { };
 
-  fltk11 = callPackage ../development/libraries/fltk/fltk11.nix { };
+  fltk13 = callPackage ../development/libraries/fltk/fltk13.nix { };
 
   fltk20 = callPackage ../development/libraries/fltk { };
 
···
   compiz_plugins_extra = callPackage ../applications/window-managers/compiz/plugins-extra.nix { };
 
   cinepaint = callPackage ../applications/graphics/cinepaint {
-    fltk = fltk11;
+    fltk = fltk13;
   };
 
   codeville = builderDefsPackage (import ../applications/version-management/codeville/0.8.0.nix) {
···
   homebank = callPackage ../applications/office/homebank { };
 
   htmldoc = callPackage ../applications/misc/htmldoc {
-    fltk = fltk11;
+    fltk = fltk13;
   };
 
   hugin = callPackage ../applications/graphics/hugin {
···
 
   rakarrack = callPackage ../applications/audio/rakarrack {
     inherit (xorg) libXpm libXft;
-    fltk = fltk11;
+    fltk = fltk13;
   };
 
   rapidsvn = callPackage ../applications/version-management/rapidsvn { };
···
   qgis = callPackage ../applications/misc/qgis {};
 
   yoshimi = callPackage ../applications/audio/yoshimi {
-    fltk = fltk11;
+    fltk = fltk13;
   };
 
   zapping = callPackage ../applications/video/zapping {
···
   zathura = callPackage ../applications/misc/zathura { };
 
   zynaddsubfx = callPackage ../applications/audio/zynaddsubfx {
-    fltk = fltk11;
+    fltk = fltk13;
   };
 
   ### GAMES