alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

fltk13, octave: expose fltk13 config and override in octave

Browse source 
Octave needs fltk with libxft, see #8007.

I'm not much familiar with composableDerivation,
so perhaps this change could be done in a better way...
This commit is contained in:
Vladimír Čunát 2015-05-28 13:10:47 +02:00
parent cb02d37c31
commit adea54614d
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/fltk/fltk13.nix
View file

@ -1,6 +1,6 @@
{ composableDerivation, fetchurl, pkgconfig, x11, inputproto, libXi { composableDerivation, fetchurl, pkgconfig, x11, inputproto, libXi
, freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng , freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng
, cfg ? {}
, automake, autoconf, libtool , automake, autoconf, libtool
}: }:
@ -48,7 +48,7 @@ composableDerivation.composableDerivation {} {
localpngSupport = false; localpngSupport = false;
sharedSupport = true; sharedSupport = true;
threadsSupport = true; threadsSupport = true;
}; } // cfg;
meta = { meta = {
description = "A C++ cross-platform light-weight GUI library binding"; description = "A C++ cross-platform light-weight GUI library binding";

4
pkgs/top-level/all-packages.nix
View file

@ -4782,7 +4782,7 @@ let
}; };
octave = callPackage ../development/interpreters/octave { octave = callPackage ../development/interpreters/octave {
fltk = fltk13; fltk = fltk13.override { cfg.xftSupport = true; };
qt = null; qt = null;
ghostscript = null; ghostscript = null;
llvm = null; llvm = null;
@ -4792,7 +4792,7 @@ let
jdk = null; jdk = null;
}; };
octaveFull = (lowPrio (callPackage ../development/interpreters/octave { octaveFull = (lowPrio (callPackage ../development/interpreters/octave {
fltk = fltk13; fltk = fltk13.override { cfg.xftSupport = true; };
qt = qt4; qt = qt4;
})); }));