JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fltk13: various fixups

Browse Source
This commit is contained in:
Vladimír Čunát 2016-05-26 10:35:29 +02:00
parent 2607b53e9d
commit e5c500475c
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/fltk/default.nix
View File

@ -1,7 +1,6 @@
{ stdenv, composableDerivation, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi { stdenv, composableDerivation, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi
, freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng , freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng
, cfg ? {} , cfg ? {}
, automake, autoconf, libtool
}: }:
let inherit (composableDerivation) edf; in let inherit (composableDerivation) edf; in
@ -16,19 +15,15 @@ composableDerivation.composableDerivation {} {
}; };
# http://www.fltk.org/str.php?L3156 # http://www.fltk.org/str.php?L3156
patchPhase = '' postPatch = ''
substituteInPlace FL/x.H \ substituteInPlace FL/x.H \
--replace 'class Fl_XFont_On_Demand' 'class FL_EXPORT Fl_XFont_On_Demand' --replace 'class Fl_XFont_On_Demand' 'class FL_EXPORT Fl_XFont_On_Demand'
''; '';
nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ xlibsWrapper inputproto libXi freeglut ]; propagatedBuildInputs = [ xlibsWrapper inputproto libXi freeglut ];
enableParallelBilding = true; enableParallelBuilding = true;
nativeBuildInputs = [
pkgconfig
automake autoconf libtool # only required because of patch
];
flags = flags =
# this could be tidied up (?).. eg why does it require freeglut without glSupport? # this could be tidied up (?).. eg why does it require freeglut without glSupport?

2
pkgs/top-level/all-packages.nix
View File

@ -6906,7 +6906,7 @@ in
flite = callPackage ../development/libraries/flite { }; flite = callPackage ../development/libraries/flite { };
fltk13 = callPackage ../development/libraries/fltk { }; fltk13 = callPackage ../development/libraries/fltk { };
fltk = callPackage ../development/libraries/fltk { }; fltk = self.fltk13;
fmod = callPackage ../development/libraries/fmod { }; fmod = callPackage ../development/libraries/fmod { };