alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

fltk: fix on darwin

Browse source 
Compiling Fl_cocoa.mm...
Fl_cocoa.mm:4079:30: error: use of undeclared identifier 'version'; did
you mean 'Fl::version'?
    NSOperatingSystemVersion version = [[NSProcessInfo processInfo]
operatingSystemVersion];
                             ^~~~~~~
                             Fl::version
../FL/Fl.H:262:17: note: 'Fl::version' declared here
  static double version();
                ^
Fl_cocoa.mm:4079:5: error: use of undeclared identifier
'NSOperatingSystemVersion'
    NSOperatingSystemVersion version = [[NSProcessInfo processInfo]
operatingSystemVersion];
    ^
Fl_cocoa.mm:4080:9: error: use of undeclared identifier 'version'
    M = version.majorVersion;
        ^
Fl_cocoa.mm:4081:9: error: use of undeclared identifier 'version'
    m = version.minorVersion;
        ^
Fl_cocoa.mm:4082:9: error: use of undeclared identifier 'version'
    b = version.patchVersion;
        ^
5 errors generated.
This commit is contained in:
Dmitry Kalinkin 2016-10-23 00:51:29 -04:00
parent a4e43841a2
commit e35ddbec13
No known key found for this signature in database
GPG key ID: 5157B3EC8B2CA333
2 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/libraries/fltk/default.nix
View file

@ -21,6 +21,8 @@ composableDerivation.composableDerivation {} {
--replace 'class Fl_XFont_On_Demand' 'class FL_EXPORT Fl_XFont_On_Demand'
'';
patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ];
nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ inputproto ]
++ (if stdenv.isDarwin

20
pkgs/development/libraries/fltk/nsosv.patch Normal file
View file

@ -0,0 +1,20 @@
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
index 6f5b8b1..2c7763d 100644
--- a/src/Fl_cocoa.mm
+++ b/src/Fl_cocoa.mm
@@ -4074,15 +4074,6 @@ Window fl_xid(const Fl_Window* w)
static int calc_mac_os_version() {
int M, m, b = 0;
NSAutoreleasePool *localPool = [[NSAutoreleasePool alloc] init];
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_10
- if ([NSProcessInfo instancesRespondToSelector:@selector(operatingSystemVersion)]) {
- NSOperatingSystemVersion version = [[NSProcessInfo processInfo] operatingSystemVersion];
- M = version.majorVersion;
- m = version.minorVersion;
- b = version.patchVersion;
- }
- else
-#endif
{
NSDictionary * sv = [NSDictionary dictionaryWithContentsOfFile:@"/System/Library/CoreServices/SystemVersion.plist"];
const char *s = [[sv objectForKey:@"ProductVersion"] UTF8String];