diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index 242f1cb00a77..42a8f817882f 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? diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e98ec439aab..2fecd4fa6d10 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6906,7 +6906,7 @@ in flite = callPackage ../development/libraries/flite { }; fltk13 = callPackage ../development/libraries/fltk { }; - fltk = callPackage ../development/libraries/fltk { }; + fltk = self.fltk13; fmod = callPackage ../development/libraries/fmod { };