Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: aed2dea55a93
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b6dcb9e64195
Choose a head ref
  • 13 commits
  • 12 files changed
  • 1 contributor

Commits on Nov 4, 2018

  1. darwin: don't include cf-private in framework dependencies 

    Using cf-private can cause problems, it's better to include it
explicitly in places where it's actually required.
    @LnL7
    LnL7 committed Nov 4, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    eadwu Edmund Wu
    GPG key ID: 43C9E53FFCF51DEC
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f2fadc0 View commit details

Commits on Nov 5, 2018

  1. SDL2: include cf-private on darwin 

    It's not included implicitly by the frameworks anymore.

    Undefined symbols for architecture x86_64:
      "_NSDefaultRunLoopMode", referenced from:
          _Cocoa_PumpEvents in SDL_cocoaevents.o
      "_NSURLIsAliasFileKey", referenced from:
          -[SDLWindow performDragOperation:] in SDL_cocoawindow.o
      "_OBJC_CLASS_$_NSArray", referenced from:
          objc-class-ref in SDL_cocoaclipboard.o
          objc-class-ref in SDL_cocoakeyboard.o
          objc-class-ref in SDL_cocoawindow.o
      "_OBJC_CLASS_$_NSData", referenced from:
          objc-class-ref in SDL_cocoamouse.o
      "_OBJC_CLASS_$_NSDate", referenced from:
          objc-class-ref in SDL_cocoaevents.o
      "_OBJC_CLASS_$_NSDictionary", referenced from:
          objc-class-ref in SDL_cocoaevents.o
      "_OBJC_CLASS_$_NSMutableArray", referenced from:
          objc-class-ref in SDL_cocoawindow.o
      "_OBJC_CLASS_$_NSURL", referenced from:
          objc-class-ref in SDL_cocoawindow.o
      "_OBJC_CLASS_$_NSUserDefaults", referenced from:
          objc-class-ref in SDL_cocoaevents.o
      "_OBJC_EHTYPE_$_NSException", referenced from:
          GCC_except_table67 in SDL_cocoawindow.o
    ld: symbol(s) not found for architecture x86_64
    @LnL7
    LnL7 committed Nov 5, 2018
    Copy the full SHA
    fd1ffd0 View commit details

  2. SDL: include cf-private on darwin 

    It's not included implicitly by the frameworks anymore.

    Undefined symbols for architecture x86_64:
      "_NSDefaultRunLoopMode", referenced from:
          _QZ_PumpEvents in SDL_QuartzEvents.o
      "_OBJC_CLASS_$_NSArray", referenced from:
          objc-class-ref in SDL_QuartzEvents.o
      "_OBJC_CLASS_$_NSDate", referenced from:
          objc-class-ref in SDL_QuartzEvents.o
    ld: symbol(s) not found for architecture x86_64
    @LnL7
    LnL7 committed Nov 5, 2018
    Copy the full SHA
    7edfded View commit details

  3. SDL: move overrides out of all-packages.nix 

    Using defaults makes it much easier to understand what the values are.
    @LnL7
    LnL7 committed Nov 5, 2018
    Copy the full SHA
    8abc1cc View commit details

  4. atomicparsley: include cf-private on darwin 

        Undefined symbols for architecture x86_64:
      "_OBJC_CLASS_$_NSDictionary", referenced from:
          objc-class-ref in nsfile.o
          objc-class-ref in nsimage.o
    ld: symbol(s) not found for architecture x86_64
    @LnL7
    LnL7 committed Nov 5, 2018
    Copy the full SHA
    c8e480b View commit details

  5. pinentry_mac: add cf-private 

        Undefined symbols for architecture x86_64:
      "_OBJC_CLASS_$_NSArray", referenced from:
          objc-class-ref in GPGDefaults.o
      "_OBJC_CLASS_$_NSDictionary", referenced from:
          objc-class-ref in PinentryController.o
          objc-class-ref in GPGDefaults.o
          objc-class-ref in KeychainSupport.o
      "_OBJC_CLASS_$_NSMutableDictionary", referenced from:
          objc-class-ref in GPGDefaults.o
      "_OBJC_CLASS_$_NSSet", referenced from:
          objc-class-ref in GPGDefaults.o
      "_OBJC_CLASS_$_NSUserDefaults", referenced from:
          objc-class-ref in GPGDefaults.o
    ld: symbol(s) not found for architecture x86_64
    @LnL7
    LnL7 committed Nov 5, 2018
    Copy the full SHA
    7fd359f View commit details

  6. vim: add cf-private on darwin 

        Undefined symbols for architecture x86_64:
      "_OBJC_CLASS_$_NSArray", referenced from:
          objc-class-ref in os_macosx.o
    ld: symbol(s) not found for architecture x86_64
    @LnL7
    LnL7 committed Nov 5, 2018
    Copy the full SHA
    d4b7c2b View commit details

  7. contacts: add cf-private 

        Undefined symbols for architecture x86_64:
      "_OBJC_CLASS_$_NSArray", referenced from:
          objc-class-ref in contacts.o
          objc-class-ref in FormatHelper.o
      "_OBJC_CLASS_$_NSMutableArray", referenced from:
          objc-class-ref in FormatHelper.o
    ld: symbol(s) not found for architecture x86_64
    @LnL7
    LnL7 committed Nov 5, 2018
    Copy the full SHA
    86bf715 View commit details

  8. emacs: include cf-private on darwin and don't propagate frameworks 

        Undefined symbols for architecture x86_64:
      "_CFNotificationCenterAddObserver", referenced from:
          _macfont_copy_available_families_cache in macfont.o
      "_CFNotificationCenterGetLocalCenter", referenced from:
          _macfont_copy_available_families_cache in macfont.o
      "_NSDefaultRunLoopMode", referenced from:
          _ns_send_appdefined in nsterm.o
          -[EmacsApp run] in nsterm.o
      "_OBJC_CLASS_$_NSArray", referenced from:
          objc-class-ref in nsterm.o
          objc-class-ref in nsmenu.o
          objc-class-ref in nsselect.o
      "_OBJC_CLASS_$_NSData", referenced from:
          objc-class-ref in nsimage.o
      "_OBJC_CLASS_$_NSDate", referenced from:
          objc-class-ref in nsterm.o
      "_OBJC_CLASS_$_NSDictionary", referenced from:
          objc-class-ref in macfont.o
      "_OBJC_CLASS_$_NSLocale", referenced from:
          objc-class-ref in nsterm.o
      "_OBJC_CLASS_$_NSMutableArray", referenced from:
          objc-class-ref in nsterm.o
          objc-class-ref in nsmenu.o
      "_OBJC_CLASS_$_NSMutableDictionary", referenced from:
          objc-class-ref in nsmenu.o
          objc-class-ref in nsselect.o
      "_OBJC_CLASS_$_NSMutableSet", referenced from:
          objc-class-ref in nsterm.o
      "_OBJC_CLASS_$_NSRunLoop", referenced from:
          objc-class-ref in nsmenu.o
      "_OBJC_CLASS_$_NSTimer", referenced from:
          objc-class-ref in nsterm.o
          objc-class-ref in nsmenu.o
      "_OBJC_CLASS_$_NSURL", referenced from:
          objc-class-ref in nsterm.o
          objc-class-ref in nsfns.o
      "_OBJC_CLASS_$_NSUserDefaults", referenced from:
          objc-class-ref in nsterm.o
          objc-class-ref in nsfns.o
      "_OBJC_EHTYPE_$_NSException", referenced from:
          GCC_except_table8 in nsterm.o
          GCC_except_table1 in nsselect.o
    ld: symbol(s) not found for architecture x86_64
    @LnL7
    LnL7 committed Nov 5, 2018
    Copy the full SHA
    f495707 View commit details

Commits on Nov 6, 2018

  1. quartz-wm: add cf-private 

        Undefined symbols for architecture x86_64:
      "_CFNotificationCenterAddObserver", referenced from:
          _main in main.o
      "_CFNotificationCenterGetDistributedCenter", referenced from:
          _main in main.o
      "_OBJC_CLASS_$_NSTimer", referenced from:
          objc-class-ref in main.o
          objc-class-ref in x-screen.o
      "_OBJC_EHTYPE_$_NSException", referenced from:
          GCC_except_table25 in main.o
    ld: symbol(s) not found for architecture x86_64
    @LnL7
    LnL7 committed Nov 6, 2018
    Copy the full SHA
    f00a4af View commit details

  2. xquartz: add cf-private 

        Undefined symbols for architecture x86_64:
      "_NSDefaultRunLoopMode", referenced from:
          _X11ApplicationMain in libXquartz.a(X11Application.o)
      "_OBJC_CLASS_$_NSArray", referenced from:
          objc-class-ref in libXquartz.a(X11Application.o)
          objc-class-ref in libXquartz.a(X11Controller.o)
          objc-class-ref in libxpbproxy.a(x-selection.o)
      "_OBJC_CLASS_$_NSData", referenced from:
          objc-class-ref in libxpbproxy.a(x-selection.o)
      "_OBJC_CLASS_$_NSDictionary", referenced from:
          objc-class-ref in libxpbproxy.a(x-selection.o)
      "_OBJC_CLASS_$_NSMutableArray", referenced from:
          objc-class-ref in libXquartz.a(X11Application.o)
          objc-class-ref in libXquartz.a(X11Controller.o)
      "_OBJC_CLASS_$_NSMutableDictionary", referenced from:
          objc-class-ref in libXquartz.a(X11Application.o)
      "_OBJC_CLASS_$_NSRunLoop", referenced from:
          objc-class-ref in libXquartz.a(X11Application.o)
      "_OBJC_CLASS_$_NSURL", referenced from:
          objc-class-ref in libXquartz.a(X11Application.o)
      "_OBJC_EHTYPE_$_NSException", referenced from:
          GCC_except_table29 in libxpbproxy.a(x-selection.o)
    ld: symbol(s) not found for architecture x86_64
    @LnL7
    LnL7 committed Nov 6, 2018
    Copy the full SHA
    2b76ad8 View commit details

  3. xorg.xorgserver: add cf-private on darwin 

        Undefined symbols for architecture x86_64:
      "_NSDefaultRunLoopMode", referenced from:
          _X11ApplicationMain in libXquartz.a(X11Application.o)
      "_OBJC_CLASS_$_NSArray", referenced from:
          objc-class-ref in libXquartz.a(X11Application.o)
          objc-class-ref in libXquartz.a(X11Controller.o)
          objc-class-ref in libxpbproxy.a(x-selection.o)
      "_OBJC_CLASS_$_NSData", referenced from:
          objc-class-ref in libxpbproxy.a(x-selection.o)
      "_OBJC_CLASS_$_NSDictionary", referenced from:
          objc-class-ref in libxpbproxy.a(x-selection.o)
      "_OBJC_CLASS_$_NSMutableArray", referenced from:
          objc-class-ref in libXquartz.a(X11Application.o)
          objc-class-ref in libXquartz.a(X11Controller.o)
      "_OBJC_CLASS_$_NSMutableDictionary", referenced from:
          objc-class-ref in libXquartz.a(X11Application.o)
      "_OBJC_CLASS_$_NSRunLoop", referenced from:
          objc-class-ref in libXquartz.a(X11Application.o)
      "_OBJC_CLASS_$_NSURL", referenced from:
          objc-class-ref in libXquartz.a(X11Application.o)
      "_OBJC_EHTYPE_$_NSException", referenced from:
          GCC_except_table29 in libxpbproxy.a(x-selection.o)
    ld: symbol(s) not found for architecture x86_64
    @LnL7
    LnL7 committed Nov 6, 2018
    Copy the full SHA
    ecf7c9c View commit details

  4. Merge pull request #49768 from LnL7/darwin-no-cfprivate 

    darwin: don't include cf-private in framework dependencies
    @LnL7
    LnL7 authored Nov 6, 2018
    Copy the full SHA
    b6dcb9e View commit details
Loading