mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-10-04 14:00:04 +00:00
1dbd8e14ef
this shouldn't create any rebuilds Sorry this changes the "do not edit" haskell file. How is someone supposed to rename packages that are used in there if you first have to change the mapping in the cabal2nix repo?
21 lines
855 B
Diff
21 lines
855 B
Diff
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];
|