Merge #25708: fltk: 1.3.3 -> 1.3.4
This commit is contained in:
commit
9f6b1dca58
@ -6,21 +6,15 @@
|
|||||||
|
|
||||||
let inherit (composableDerivation) edf; in
|
let inherit (composableDerivation) edf; in
|
||||||
|
|
||||||
let version = "1.3.3"; in
|
let version = "1.3.4"; in
|
||||||
composableDerivation.composableDerivation {} {
|
composableDerivation.composableDerivation {} {
|
||||||
name = "fltk-${version}";
|
name = "fltk-${version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://fltk.org/pub/fltk/${version}/fltk-${version}-source.tar.gz";
|
url = "http://fltk.org/pub/fltk/${version}/fltk-${version}-source.tar.gz";
|
||||||
sha256 = "15qd7lkz5d5ynz70xhxhigpz3wns39v9xcf7ggkl0792syc8sfgq";
|
sha256 = "13y57pnayrkfzm8azdfvysm8b77ysac8zhhdsh8kxmb0x3203ay8";
|
||||||
};
|
};
|
||||||
|
|
||||||
# http://www.fltk.org/str.php?L3156
|
|
||||||
postPatch = ''
|
|
||||||
substituteInPlace FL/x.H \
|
|
||||||
--replace 'class Fl_XFont_On_Demand' 'class FL_EXPORT Fl_XFont_On_Demand'
|
|
||||||
'';
|
|
||||||
|
|
||||||
patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ];
|
patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ];
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
nativeBuildInputs = [ pkgconfig ];
|
||||||
|
Loading…
x
Reference in New Issue
Block a user