diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2019-02-09 14:00:48 -0500 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-26 21:54:32 -0400 |
commit | 0fe315c9b6080cd75f92fea1f97714b04abb4315 (patch) | |
tree | f2a52f2c91ed36e62e354681d76ef1495b66615a /pkgs/games/gargoyle | |
parent | 5fad67d3614a84118068e8657e894cc913e2325f (diff) |
treewide: remove old patches for macOS
These shouldn’t be needed now that we are on macOS 10.12.
Diffstat (limited to 'pkgs/games/gargoyle')
-rw-r--r-- | pkgs/games/gargoyle/darwin.patch | 64 | ||||
-rw-r--r-- | pkgs/games/gargoyle/default.nix | 2 |
2 files changed, 0 insertions, 66 deletions
diff --git a/pkgs/games/gargoyle/darwin.patch b/pkgs/games/gargoyle/darwin.patch deleted file mode 100644 index 6958fe495d26d..0000000000000 --- a/pkgs/games/gargoyle/darwin.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- a/garglk/fontmac.m -+++ b/garglk/fontmac.m -@@ -167,7 +167,7 @@ static void propfont(char *file, int style) - } - } - --static NSMutableArray<NSURL *> * gli_registered_fonts = nil; -+static NSMutableArray * gli_registered_fonts = nil; - static NSDistributedLock * gli_font_lock = nil; - - void fontreplace(char *font, int type) -@@ -181,7 +181,7 @@ void fontreplace(char *font, int type) - NSFontDescriptor * fontFamilyDescriptor = - [[NSFontDescriptor fontDescriptorWithFontAttributes: nil] fontDescriptorWithFamily: fontFamily]; - -- NSArray<NSFontDescriptor *> * fontMatches = -+ NSArray * fontMatches = - [fontFamilyDescriptor matchingFontDescriptorsWithMandatoryKeys: nil]; - - for (NSFontDescriptor * sysfont in fontMatches) -@@ -259,7 +259,7 @@ void fontload(void) - - // obtain a list of all files in the Fonts directory - NSString * fontFolder = [[NSString stringWithUTF8String: env] stringByAppendingPathComponent: @"Fonts"]; -- NSArray<NSString *> * fontFiles = [[NSFileManager defaultManager] contentsOfDirectoryAtPath: fontFolder error: nil]; -+ NSArray * fontFiles = [[NSFileManager defaultManager] contentsOfDirectoryAtPath: fontFolder error: nil]; - - // create a collection to hold the registered font URLs - gli_registered_fonts = [NSMutableArray new]; ---- a/garglk/launchmac.m -+++ b/garglk/launchmac.m -@@ -556,7 +556,7 @@ static BOOL isTextbufferEvent(NSEvent * evt) - <GargoyleApp, NSApplicationDelegate, NSWindowDelegate> - { - BOOL openedFirstGame; -- NSMutableDictionary<NSNumber *, GargoyleWindow *> * windows; -+ NSMutableDictionary * windows; - NSConnection * link; - } - - (BOOL) launchFile: (NSString *) file; ---- a/garglk/ttsmac.m -+++ b/garglk/ttsmac.m -@@ -30,7 +30,7 @@ - #import "sysmac.h" - - // a queue of phrases to feed to the speech synthesizer --static NSMutableArray<NSString *> * phraseQueue = nil; -+static NSMutableArray * phraseQueue = nil; - static NSRange purgeRange; - - @interface SpeechDelegate : NSObject <NSSpeechSynthesizerDelegate> -@@ -96,10 +96,10 @@ void gli_initialize_tts(void) - NSString * lang = [NSString stringWithCString: gli_conf_speak_language - encoding: NSUTF8StringEncoding]; - -- NSArray<NSString *> * voices = [NSSpeechSynthesizer availableVoices]; -+ NSArray * voices = [NSSpeechSynthesizer availableVoices]; - for (NSString * voice in voices) - { -- NSDictionary<NSString *, id> * attr = [NSSpeechSynthesizer attributesForVoice: voice]; -+ NSDictionary * attr = [NSSpeechSynthesizer attributesForVoice: voice]; - if ([lang isEqualToString: [attr objectForKey: NSVoiceLocaleIdentifier]]) - { - [synth setVoice: voice]; diff --git a/pkgs/games/gargoyle/default.nix b/pkgs/games/gargoyle/default.nix index e645a40aa752c..62ea798e46569 100644 --- a/pkgs/games/gargoyle/default.nix +++ b/pkgs/games/gargoyle/default.nix @@ -34,8 +34,6 @@ stdenv.mkDerivation { buildInputs = [ SDL SDL_mixer SDL_sound gtk2 ] ++ stdenv.lib.optionals stdenv.isDarwin [ cf-private smpeg libvorbis ]; - patches = [ ./darwin.patch ]; - buildPhase = jamenv + "jam -j$NIX_BUILD_CORES"; installPhase = |