diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2016-10-23 00:51:29 -0400 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2016-10-23 21:19:14 -0400 |
| commit | e35ddbec13a2b7d081fd83a2e4d1d286bd43ac41 (patch) | |
| tree | d3e658b5e50333857f22d0b18ace4eed60c4b4b8 /pkgs/development/libraries/fltk | |
| parent | a4e43841a217877b72575775f8dc6ac67d6a5132 (diff) | |
| download | nixlib-e35ddbec13a2b7d081fd83a2e4d1d286bd43ac41.tar nixlib-e35ddbec13a2b7d081fd83a2e4d1d286bd43ac41.tar.gz nixlib-e35ddbec13a2b7d081fd83a2e4d1d286bd43ac41.tar.bz2 nixlib-e35ddbec13a2b7d081fd83a2e4d1d286bd43ac41.tar.lz nixlib-e35ddbec13a2b7d081fd83a2e4d1d286bd43ac41.tar.xz nixlib-e35ddbec13a2b7d081fd83a2e4d1d286bd43ac41.tar.zst nixlib-e35ddbec13a2b7d081fd83a2e4d1d286bd43ac41.zip | |
fltk: fix on darwin
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.
Diffstat (limited to 'pkgs/development/libraries/fltk')
| -rw-r--r-- | pkgs/development/libraries/fltk/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/fltk/nsosv.patch | 20 |
2 files changed, 22 insertions, 0 deletions
diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index 99cb8aae3236..6f906d52502e 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -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 diff --git a/pkgs/development/libraries/fltk/nsosv.patch b/pkgs/development/libraries/fltk/nsosv.patch new file mode 100644 index 000000000000..9e55b011b571 --- /dev/null +++ b/pkgs/development/libraries/fltk/nsosv.patch @@ -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]; |