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

fltk: remove cf-private

Browse Source
This commit is contained in:
Daiderd Jordan 2019-06-19 20:05:27 +02:00
parent 6f16de27d2
commit 91b595945e
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
3 changed files with 27 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pkgs/development/libraries/fltk/1.4.nix
View File

@ -1,11 +1,13 @@
{ stdenv, fetchurl, pkgconfig, xlibsWrapper, xorgproto, libXi { stdenv, fetchurl, pkgconfig, xlibsWrapper, xorgproto, libXi
, freeglut, libGLU_combined, libjpeg, zlib, libXft, libpng , freeglut, libGLU_combined, libjpeg, zlib, libXft, libpng
, libtiff, freetype, cf-private, Cocoa, AGL, GLUT , libtiff, freetype, Cocoa, AGL, GLUT
}: }:
let let
version = "1.4.x-r13121"; version = "1.4.x-r13121";
in stdenv.mkDerivation { in
stdenv.mkDerivation {
name = "fltk-${version}"; name = "fltk-${version}";
src = fetchurl { src = fetchurl {
@ -13,19 +15,16 @@ in stdenv.mkDerivation {
sha256 = "1v8wxvxcbk99i82x2v5fpqg5vj8n7g8a38g30ry7nzcjn5sf3r63"; sha256 = "1v8wxvxcbk99i82x2v5fpqg5vj8n7g8a38g30ry7nzcjn5sf3r63";
}; };
preConfigure = "make clean";
patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ]; patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libGLU_combined libjpeg zlib libpng libXft ]
++ stdenv.lib.optional stdenv.isDarwin [ AGL Cocoa GLUT ];
buildInputs = [ propagatedBuildInputs = [ xorgproto ]
libGLU_combined ++ (if stdenv.isDarwin
libjpeg then [ freetype libtiff ]
zlib else [ xlibsWrapper libXi freeglut ]);
libpng
libXft
];
configureFlags = [ configureFlags = [
"--enable-gl" "--enable-gl"
@ -35,18 +34,15 @@ in stdenv.mkDerivation {
"--enable-xft" "--enable-xft"
]; ];
propagatedBuildInputs = [ xorgproto ] preConfigure = "make clean";
++ (if stdenv.isDarwin
then [ Cocoa AGL GLUT freetype libtiff cf-private /* Needed for NSDefaultRunLoopMode */ ]
else [ xlibsWrapper libXi freeglut ]);
enableParallelBuilding = true; enableParallelBuilding = true;
meta = { meta = with stdenv.lib; {
description = "A C++ cross-platform lightweight GUI library"; description = "A C++ cross-platform lightweight GUI library";
homepage = http://www.fltk.org; homepage = http://www.fltk.org;
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; platforms = platforms.linux ++ platforms.darwin;
license = stdenv.lib.licenses.gpl2; license = licenses.gpl2;
}; };
} }

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

@ -1,11 +1,13 @@
{ stdenv, fetchurl, pkgconfig, xlibsWrapper, xorgproto, libXi { stdenv, fetchurl, pkgconfig, xlibsWrapper, xorgproto, libXi
, freeglut, libGLU_combined, libjpeg, zlib, libXft, libpng , freeglut, libGLU_combined, libjpeg, zlib, libXft, libpng
, libtiff, freetype, cf-private, Cocoa, AGL, GLUT , libtiff, freetype, Cocoa, AGL, GLUT
}: }:
let let
version = "1.3.5"; version = "1.3.5";
in stdenv.mkDerivation { in
stdenv.mkDerivation {
name = "fltk-${version}"; name = "fltk-${version}";
src = fetchurl { src = fetchurl {
@ -16,14 +18,13 @@ in stdenv.mkDerivation {
patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ]; patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libGLU_combined libjpeg zlib libpng libXft ]
++ stdenv.lib.optional stdenv.isDarwin [ AGL Cocoa GLUT ];
buildInputs = [ propagatedBuildInputs = [ xorgproto ]
libGLU_combined ++ (if stdenv.isDarwin
libjpeg then [ freetype libtiff ]
zlib else [ xlibsWrapper libXi freeglut ]);
libpng
libXft
];
configureFlags = [ configureFlags = [
"--enable-gl" "--enable-gl"
@ -33,18 +34,12 @@ in stdenv.mkDerivation {
"--enable-xft" "--enable-xft"
]; ];
propagatedBuildInputs = [ xorgproto ]
++ (if stdenv.isDarwin
then [ Cocoa AGL GLUT freetype libtiff cf-private /* Needed for NSDefaultRunLoopMode */ ]
else [ xlibsWrapper libXi freeglut ]);
enableParallelBuilding = true; enableParallelBuilding = true;
meta = { meta = with stdenv.lib; {
description = "A C++ cross-platform lightweight GUI library"; description = "A C++ cross-platform lightweight GUI library";
homepage = http://www.fltk.org; homepage = http://www.fltk.org;
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; platforms = platforms.linux ++ platforms.darwin;
license = stdenv.lib.licenses.gpl2; license = licenses.gpl2;
}; };
} }

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

@ -10416,11 +10416,9 @@ in
flite = callPackage ../development/libraries/flite { }; flite = callPackage ../development/libraries/flite { };
fltk13 = callPackage ../development/libraries/fltk { fltk13 = callPackage ../development/libraries/fltk {
inherit (darwin) cf-private;
inherit (darwin.apple_sdk.frameworks) Cocoa AGL GLUT; inherit (darwin.apple_sdk.frameworks) Cocoa AGL GLUT;
}; };
fltk14 = callPackage ../development/libraries/fltk/1.4.nix { fltk14 = callPackage ../development/libraries/fltk/1.4.nix {
inherit (darwin) cf-private;
inherit (darwin.apple_sdk.frameworks) Cocoa AGL GLUT; inherit (darwin.apple_sdk.frameworks) Cocoa AGL GLUT;
}; };
fltk = res.fltk13; fltk = res.fltk13;