diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-26 10:35:29 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-26 10:35:29 +0200 |
| commit | e5c500475cc9d352cacd5ab18e18e0badbadc7ad (patch) | |
| tree | 264e997f8bd45a593544932ac9de86fb309f81ee /pkgs/development/libraries/fltk | |
| parent | 2607b53e9d7b66d7e016f00338502194c70cbc50 (diff) | |
| download | nixpkgs-e5c500475cc9d352cacd5ab18e18e0badbadc7ad.tar nixpkgs-e5c500475cc9d352cacd5ab18e18e0badbadc7ad.tar.gz nixpkgs-e5c500475cc9d352cacd5ab18e18e0badbadc7ad.tar.bz2 nixpkgs-e5c500475cc9d352cacd5ab18e18e0badbadc7ad.tar.lz nixpkgs-e5c500475cc9d352cacd5ab18e18e0badbadc7ad.tar.xz nixpkgs-e5c500475cc9d352cacd5ab18e18e0badbadc7ad.tar.zst nixpkgs-e5c500475cc9d352cacd5ab18e18e0badbadc7ad.zip | |
fltk13: various fixups
Diffstat (limited to 'pkgs/development/libraries/fltk')
| -rw-r--r-- | pkgs/development/libraries/fltk/default.nix | 11 |
1 files changed, 3 insertions, 8 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? |