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] 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 { };