diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-05-28 13:10:47 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-05-28 13:16:02 +0200 |
commit | adea54614d848c8a85e700885ec95a93402bd72b (patch) | |
tree | fa25f7ba9f9f89412d034ae6a156a4d4d02ce80c /pkgs/development/libraries/fltk/fltk13.nix | |
parent | cb02d37c31b83cf9f17ded6c4893a711713ccce8 (diff) | |
download | nixpkgs-adea54614d848c8a85e700885ec95a93402bd72b.tar nixpkgs-adea54614d848c8a85e700885ec95a93402bd72b.tar.gz nixpkgs-adea54614d848c8a85e700885ec95a93402bd72b.tar.bz2 nixpkgs-adea54614d848c8a85e700885ec95a93402bd72b.tar.lz nixpkgs-adea54614d848c8a85e700885ec95a93402bd72b.tar.xz nixpkgs-adea54614d848c8a85e700885ec95a93402bd72b.tar.zst nixpkgs-adea54614d848c8a85e700885ec95a93402bd72b.zip |
fltk13, octave: expose fltk13 config and override in octave
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...
Diffstat (limited to 'pkgs/development/libraries/fltk/fltk13.nix')
-rw-r--r-- | pkgs/development/libraries/fltk/fltk13.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/fltk/fltk13.nix b/pkgs/development/libraries/fltk/fltk13.nix index df89482536f..262ef8b865e 100644 --- a/pkgs/development/libraries/fltk/fltk13.nix +++ b/pkgs/development/libraries/fltk/fltk13.nix @@ -1,6 +1,6 @@ { composableDerivation, fetchurl, pkgconfig, x11, inputproto, libXi , freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng - +, cfg ? {} , automake, autoconf, libtool }: @@ -48,7 +48,7 @@ composableDerivation.composableDerivation {} { localpngSupport = false; sharedSupport = true; threadsSupport = true; - }; + } // cfg; meta = { description = "A C++ cross-platform light-weight GUI library binding"; |