diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-26 10:37:42 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-26 10:38:17 +0200 |
commit | 34e558274d4740f05d089f5870e54cc4c9209652 (patch) | |
tree | 87cf92d9f35f1cee3ab0f114e5ba6430a5588e7d | |
parent | e5c500475cc9d352cacd5ab18e18e0badbadc7ad (diff) | |
download | nixlib-34e558274d4740f05d089f5870e54cc4c9209652.tar nixlib-34e558274d4740f05d089f5870e54cc4c9209652.tar.gz nixlib-34e558274d4740f05d089f5870e54cc4c9209652.tar.bz2 nixlib-34e558274d4740f05d089f5870e54cc4c9209652.tar.lz nixlib-34e558274d4740f05d089f5870e54cc4c9209652.tar.xz nixlib-34e558274d4740f05d089f5870e54cc4c9209652.tar.zst nixlib-34e558274d4740f05d089f5870e54cc4c9209652.zip |
fltk13: `xftSupport = true` by default
It seems often desired.
-rw-r--r-- | pkgs/development/libraries/fltk/default.nix | 1 | ||||
-rw-r--r-- | 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 42a8f817882f..772ea2030c2a 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 2fecd4fa6d10..a861ec3da23a 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 { }; |