Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

wxmac: 3.0.2 -> 3.0.4 (darwin) #49081

Merged
merged 3 commits into from Oct 27, 2018
Merged

wxmac: 3.0.2 -> 3.0.4 (darwin) #49081

merged 3 commits into from Oct 27, 2018

Conversation

LnL7
Copy link
Member

@LnL7 LnL7 commented Oct 24, 2018

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

@LnL7
darwin.cf-private: include headers from osx_private_sdk
0fcd2ca 
This includes things like CFURLGetFSRef which are not part of the
swift-corelibs CoreFoundation.
@LnL7
wxmac: include cf-private
0df3d8d 
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
wxmac: 3.0.2 -> 3.0.4
fcbaa75
@GrahamcOfBorg GrahamcOfBorg added the 6.topic: darwin Running or building packages on Darwin label Oct 24, 2018
@LnL7 LnL7 mentioned this pull request Oct 24, 2018
Merged
9 tasks
@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: wxmac

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

No attempt on x86_64-linux (full log)

The following builds were skipped because they don't evaluate on x86_64-linux: wxmac

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: wxmac

Partial log (click to expand)

/nix/store/f7zz4v5ar4w2yk2vwbgdwphagxcm7ijd-wxmac-3.0.4/lib/libwx_osx_cocoau_core-3.0.0.4.0.dylib: fixing dylib
/nix/store/f7zz4v5ar4w2yk2vwbgdwphagxcm7ijd-wxmac-3.0.4/lib/libwx_osx_cocoau_gl-3.0.0.4.0.dylib: fixing dylib
/nix/store/f7zz4v5ar4w2yk2vwbgdwphagxcm7ijd-wxmac-3.0.4/lib/libwx_osx_cocoau_html-3.0.0.4.0.dylib: fixing dylib
/nix/store/f7zz4v5ar4w2yk2vwbgdwphagxcm7ijd-wxmac-3.0.4/lib/libwx_osx_cocoau_propgrid-3.0.0.4.0.dylib: fixing dylib
/nix/store/f7zz4v5ar4w2yk2vwbgdwphagxcm7ijd-wxmac-3.0.4/lib/libwx_osx_cocoau_qa-3.0.0.4.0.dylib: fixing dylib
/nix/store/f7zz4v5ar4w2yk2vwbgdwphagxcm7ijd-wxmac-3.0.4/lib/libwx_osx_cocoau_ribbon-3.0.0.4.0.dylib: fixing dylib
/nix/store/f7zz4v5ar4w2yk2vwbgdwphagxcm7ijd-wxmac-3.0.4/lib/libwx_osx_cocoau_richtext-3.0.0.4.0.dylib: fixing dylib
/nix/store/f7zz4v5ar4w2yk2vwbgdwphagxcm7ijd-wxmac-3.0.4/lib/libwx_osx_cocoau_stc-3.0.0.4.0.dylib: fixing dylib
/nix/store/f7zz4v5ar4w2yk2vwbgdwphagxcm7ijd-wxmac-3.0.4/lib/libwx_osx_cocoau_xrc-3.0.0.4.0.dylib: fixing dylib
/nix/store/f7zz4v5ar4w2yk2vwbgdwphagxcm7ijd-wxmac-3.0.4

@LnL7 LnL7 merged commit 450d33f into NixOS:master Oct 27, 2018
@LnL7 LnL7 deleted the darwin-wxmac branch October 27, 2018 09:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 501+ 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@LnL7 @GrahamcOfBorg @matthewbauer