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
base: 12764421b87d
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 450d33fc5b04
Choose a head ref
  • 4 commits
  • 4 files changed
  • 1 contributor

Commits on Oct 24, 2018

  1. darwin.cf-private: include headers from osx_private_sdk 

    This includes things like CFURLGetFSRef which are not part of the
swift-corelibs CoreFoundation.
    @LnL7
    LnL7 committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    0fcd2ca View commit details
    Browse the repository at this point in the history

  2. wxmac: include cf-private 

    Fixes build failure because CoreFoundation doesn't include
CFURLGetFSRef anymore.

    clang++ -mmacosx-version-min=10.7 -c -o basedll_filefn.o  -D__WXOSX_COCOA__      -DWXBUILDING      -I./src/regex  -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 -dynamic -fPIC -DPIC -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -D_FILE_OFFSET_BITS=64 -I/private/tmp/nix-build-wxmac-3.0.2.drv-0/wxWidgets-3.0.2/lib/wx/include/osx_cocoa-unicode-3.0 -I./include -O2 -fno-strict-aliasing -fno-common  ./src/common/filefn.cpp
    ./src/common/filefn.cpp:849:18: error: use of undeclared identifier 'CFURLCreateFromFSRef'
        fullURLRef = CFURLCreateFromFSRef(NULL, fsRef);
                     ^
    ./src/common/filefn.cpp:875:14: error: use of undeclared identifier 'CFURLGetFSRef'
            if ( CFURLGetFSRef(url, fsRef) == false )
    @LnL7
    LnL7 committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    0df3d8d View commit details
    Browse the repository at this point in the history

  3. wxmac: 3.0.2 -> 3.0.4

    @LnL7
    LnL7 committed Oct 24, 2018
    2 Configuration menu
    Copy the full SHA
    fcbaa75 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2018

  1. Merge pull request #49081 from LnL7/darwin-wxmac 

     wxmac: 3.0.2 -> 3.0.4 (darwin)
    @LnL7
    LnL7 committed Oct 27, 2018
    Configuration menu
    Copy the full SHA
    450d33f View commit details
    Browse the repository at this point in the history