diff options
| -rw-r--r-- | pkgs/development/libraries/fltk/fltk13.nix (renamed from pkgs/development/libraries/fltk/fltk11.nix) | 9 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 12 |
2 files changed, 11 insertions, 10 deletions
diff --git a/pkgs/development/libraries/fltk/fltk11.nix b/pkgs/development/libraries/fltk/fltk13.nix index 118b24ec317..d3d89e6a907 100644 --- a/pkgs/development/libraries/fltk/fltk11.nix +++ b/pkgs/development/libraries/fltk/fltk13.nix @@ -3,17 +3,18 @@ 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? diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 15cfd3398e5..ce8c9b00069 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3362,7 +3362,7 @@ let flite = callPackage ../development/libraries/flite { }; - fltk11 = callPackage ../development/libraries/fltk/fltk11.nix { }; + fltk13 = callPackage ../development/libraries/fltk/fltk13.nix { }; fltk20 = callPackage ../development/libraries/fltk { }; @@ -6449,7 +6449,7 @@ let 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) { @@ -6874,7 +6874,7 @@ let homebank = callPackage ../applications/office/homebank { }; htmldoc = callPackage ../applications/misc/htmldoc { - fltk = fltk11; + fltk = fltk13; }; hugin = callPackage ../applications/graphics/hugin { @@ -7264,7 +7264,7 @@ let rakarrack = callPackage ../applications/audio/rakarrack { inherit (xorg) libXpm libXft; - fltk = fltk11; + fltk = fltk13; }; rapidsvn = callPackage ../applications/version-management/rapidsvn { }; @@ -7690,7 +7690,7 @@ let qgis = callPackage ../applications/misc/qgis {}; yoshimi = callPackage ../applications/audio/yoshimi { - fltk = fltk11; + fltk = fltk13; }; zapping = callPackage ../applications/video/zapping { @@ -7704,7 +7704,7 @@ let zathura = callPackage ../applications/misc/zathura { }; zynaddsubfx = callPackage ../applications/audio/zynaddsubfx { - fltk = fltk11; + fltk = fltk13; }; ### GAMES |