From 2607b53e9d7b66d7e016f00338502194c70cbc50 Mon Sep 17 00:00:00 2001 From: Julien Dehos Date: Sun, 22 May 2016 16:50:31 +0200 Subject: [PATCH 1/3] fltk: 2-alpha -> 1.3.3 --- pkgs/development/libraries/fltk/default.nix | 37 +++++++++--- pkgs/development/libraries/fltk/fltk13.nix | 66 --------------------- pkgs/top-level/all-packages.nix | 7 +-- 3 files changed, 31 insertions(+), 79 deletions(-) delete mode 100644 pkgs/development/libraries/fltk/fltk13.nix diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index 6398e5542ac..242f1cb00a7 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -1,19 +1,34 @@ -{ composableDerivation, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi -, freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng }: +{ stdenv, composableDerivation, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi +, freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng +, cfg ? {} +, automake, autoconf, libtool +}: let inherit (composableDerivation) edf; in -composableDerivation.composableDerivation {} rec { - name = "fltk-2.0.x-alpha-r9296"; +let version = "1.3.3"; in +composableDerivation.composableDerivation {} { + name = "fltk-${version}"; src = fetchurl { - url = "ftp://ftp.easysw.com/pub/fltk/snapshots/${name}.tar.bz2"; - sha256 = "0353ngb7gpyklc9mdz8629big2na3c73akfwhis8fhqp7jkbs9ih"; + url = "http://fltk.org/pub/fltk/${version}/fltk-${version}-source.tar.gz"; + sha256 = "15qd7lkz5d5ynz70xhxhigpz3wns39v9xcf7ggkl0792syc8sfgq"; }; + # http://www.fltk.org/str.php?L3156 + patchPhase = '' + substituteInPlace FL/x.H \ + --replace 'class Fl_XFont_On_Demand' 'class FL_EXPORT Fl_XFont_On_Demand' + ''; + propagatedBuildInputs = [ xlibsWrapper inputproto libXi freeglut ]; - buildInputs = [ pkgconfig ]; + enableParallelBilding = true; + + nativeBuildInputs = [ + pkgconfig + automake autoconf libtool # only required because of patch + ]; flags = # this could be tidied up (?).. eg why does it require freeglut without glSupport? @@ -39,10 +54,14 @@ composableDerivation.composableDerivation {} rec { localpngSupport = false; sharedSupport = true; threadsSupport = true; - }; + } // cfg; meta = { - description = "a C++ cross platform lightweight gui library binding"; + description = "A C++ cross-platform lightweight GUI library"; homepage = http://www.fltk.org; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; }; + } + diff --git a/pkgs/development/libraries/fltk/fltk13.nix b/pkgs/development/libraries/fltk/fltk13.nix deleted file mode 100644 index cb71724a360..00000000000 --- a/pkgs/development/libraries/fltk/fltk13.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ composableDerivation, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi -, freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng -, cfg ? {} -, automake, autoconf, libtool -}: - -let inherit (composableDerivation) edf; in - -let version = "1.3.3"; in -composableDerivation.composableDerivation {} { - name = "fltk-${version}"; - - src = fetchurl { - url = "http://fltk.org/pub/fltk/${version}/fltk-${version}-source.tar.gz"; - sha256 = "15qd7lkz5d5ynz70xhxhigpz3wns39v9xcf7ggkl0792syc8sfgq"; - }; - - # http://www.fltk.org/str.php?L3156 - postPatch = '' - substituteInPlace FL/x.H \ - --replace 'class Fl_XFont_On_Demand' 'class FL_EXPORT Fl_XFont_On_Demand' - ''; - - propagatedBuildInputs = [ xlibsWrapper inputproto libXi freeglut ]; - - enableParallelBilding = true; - - nativeBuildInputs = [ - pkgconfig - automake autoconf libtool # only required because of patch - ]; - - flags = - # this could be tidied up (?).. eg why does it require freeglut without glSupport? - edf { name = "cygwin"; } # use the CygWin libraries default=no - // edf { name = "debug"; } # turn on debugging default=no - // edf { name = "gl"; enable = { buildInputs = [ mesa ]; }; } # turn on OpenGL support default=yes - // edf { name = "shared"; } # turn on shared libraries default=no - // edf { name = "threads"; } # enable multi-threading support - // edf { name = "quartz"; enable = { buildInputs = "quartz"; }; } # don't konw yet what quartz is # use Quartz instead of Quickdraw (default=no) - // edf { name = "largefile"; } # omit support for large files - // edf { name = "localjpeg"; disable = { buildInputs = [libjpeg]; }; } # use local JPEG library, default=auto - // edf { name = "localzlib"; disable = { buildInputs = [zlib]; }; } # use local ZLIB library, default=auto - // edf { name = "localpng"; disable = { buildInputs = [libpng]; }; } # use local PNG library, default=auto - // edf { name = "xinerama"; enable = { buildInputs = [libXinerama]; }; } # turn on Xinerama support default=no - // edf { name = "xft"; enable = { buildInputs=[libXft]; }; } # turn on Xft support default=no - // edf { name = "xdbe"; }; # turn on Xdbe support default=no - - cfg = { - largefileSupport = true; # is default - glSupport = true; # doesn't build without it. Why? - localjpegSupport = false; - localzlibSupport = false; - localpngSupport = false; - sharedSupport = true; - threadsSupport = true; - } // cfg; - - meta = { - description = "A C++ cross-platform light-weight GUI library binding"; - homepage = http://www.fltk.org; - }; - - patches = [ - ]; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bc994fb3349..6e98ec439aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6905,9 +6905,8 @@ in flite = callPackage ../development/libraries/flite { }; - fltk13 = callPackage ../development/libraries/fltk/fltk13.nix { }; - - fltk20 = callPackage ../development/libraries/fltk { }; + fltk13 = callPackage ../development/libraries/fltk { }; + fltk = callPackage ../development/libraries/fltk { }; fmod = callPackage ../development/libraries/fmod { }; @@ -12477,7 +12476,7 @@ in keepass-keefox = callPackage ../applications/misc/keepass-plugins/keefox { }; exrdisplay = callPackage ../applications/graphics/exrdisplay { - fltk = fltk20; + fltk = fltk13.override { cfg.xftSupport = true; }; }; fbpanel = callPackage ../applications/window-managers/fbpanel { }; From e5c500475cc9d352cacd5ab18e18e0badbadc7ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 26 May 2016 10:35:29 +0200 Subject: [PATCH 2/3] fltk13: various fixups --- pkgs/development/libraries/fltk/default.nix | 11 +++-------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index 242f1cb00a7..42a8f817882 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -1,7 +1,6 @@ { stdenv, composableDerivation, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi , freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng , cfg ? {} -, automake, autoconf, libtool }: let inherit (composableDerivation) edf; in @@ -16,19 +15,15 @@ composableDerivation.composableDerivation {} { }; # http://www.fltk.org/str.php?L3156 - patchPhase = '' + postPatch = '' substituteInPlace FL/x.H \ --replace 'class Fl_XFont_On_Demand' 'class FL_EXPORT Fl_XFont_On_Demand' ''; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ xlibsWrapper inputproto libXi freeglut ]; - enableParallelBilding = true; - - nativeBuildInputs = [ - pkgconfig - automake autoconf libtool # only required because of patch - ]; + enableParallelBuilding = true; 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 6e98ec439aa..2fecd4fa6d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6906,7 +6906,7 @@ in flite = callPackage ../development/libraries/flite { }; fltk13 = callPackage ../development/libraries/fltk { }; - fltk = callPackage ../development/libraries/fltk { }; + fltk = self.fltk13; fmod = callPackage ../development/libraries/fmod { }; From 34e558274d4740f05d089f5870e54cc4c9209652 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 26 May 2016 10:37:42 +0200 Subject: [PATCH 3/3] fltk13: `xftSupport = true` by default It seems often desired. --- pkgs/development/libraries/fltk/default.nix | 1 + pkgs/top-level/all-packages.nix | 14 +++----------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index 42a8f817882..772ea2030c2 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -49,6 +49,7 @@ composableDerivation.composableDerivation {} { localpngSupport = false; sharedSupport = true; threadsSupport = true; + xftSupport = true; } // cfg; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2fecd4fa6d1..a861ec3da23 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5554,7 +5554,6 @@ in }; octave = callPackage ../development/interpreters/octave { - fltk = fltk13.override { cfg.xftSupport = true; }; qt = null; ghostscript = null; llvm = null; @@ -5565,7 +5564,6 @@ in openblas = openblasCompat; }; octaveFull = (lowPrio (callPackage ../development/interpreters/octave { - fltk = fltk13.override { cfg.xftSupport = true; }; qt = qt4; })); @@ -12475,9 +12473,7 @@ in keepass-keefox = callPackage ../applications/misc/keepass-plugins/keefox { }; - exrdisplay = callPackage ../applications/graphics/exrdisplay { - fltk = fltk13.override { cfg.xftSupport = true; }; - }; + exrdisplay = callPackage ../applications/graphics/exrdisplay { }; fbpanel = callPackage ../applications/window-managers/fbpanel { }; @@ -14841,9 +14837,7 @@ in ykpers = callPackage ../applications/misc/ykpers {}; - yoshimi = callPackage ../applications/audio/yoshimi { - fltk = fltk13.override { cfg.xftSupport = true; }; - }; + yoshimi = callPackage ../applications/audio/yoshimi { }; zam-plugins = callPackage ../applications/audio/zam-plugins { }; @@ -15024,9 +15018,7 @@ in fish-fillets-ng = callPackage ../games/fish-fillets-ng {}; - flightgear = qt5.callPackage ../games/flightgear { - fltk13 = fltk13.override { cfg.xftSupport = true; }; - }; + flightgear = qt5.callPackage ../games/flightgear { }; freecell-solver = callPackage ../games/freecell-solver { };