public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wxmac: include cf-private

Browse Source 
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 )
This commit is contained in:
Daiderd Jordan 2018-10-24 12:07:50 +02:00
parent 0fcd2ca7b2
commit 0df3d8d6c4
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/wxwidgets/3.0/mac.nix
View File

@ -1,11 +1,9 @@
{ stdenv, fetchurl, fetchpatch, expat, libiconv, libjpeg, libpng, libtiff, zlib { stdenv, fetchurl, fetchpatch, expat, libiconv, libjpeg, libpng, libtiff, zlib
# darwin only attributes # darwin only attributes
, derez, rez, setfile , cf-private, derez, rez, setfile
, AGL, Cocoa, Kernel , AGL, Cocoa, Kernel
}: }:
with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "3.0.2"; version = "3.0.2";
name = "wxmac-${version}"; name = "wxmac-${version}";
@ -55,6 +53,10 @@ stdenv.mkDerivation rec {
expat libiconv libjpeg libpng libtiff zlib expat libiconv libjpeg libpng libtiff zlib
derez rez setfile derez rez setfile
Cocoa Kernel Cocoa Kernel
# Needed for CFURLGetFSRef, etc. which have deen deprecated
# since 10.9 and are not part of swift-corelibs CoreFoundation.
cf-private
]; ];
propagatedBuildInputs = [ AGL ]; propagatedBuildInputs = [ AGL ];
@ -98,7 +100,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
meta = { meta = with stdenv.lib; {
platforms = platforms.darwin; platforms = platforms.darwin;
license = licenses.wxWindows; license = licenses.wxWindows;
maintainers = [ maintainers.lnl7 ]; maintainers = [ maintainers.lnl7 ];

1
pkgs/top-level/all-packages.nix
View File

@ -12692,6 +12692,7 @@ with pkgs;
wxmac = callPackage ../development/libraries/wxwidgets/3.0/mac.nix { wxmac = callPackage ../development/libraries/wxwidgets/3.0/mac.nix {
inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel; inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel;
inherit (darwin.stubs) setfile rez derez; inherit (darwin.stubs) setfile rez derez;
inherit (darwin) cf-private;
}; };
wxSVG = callPackage ../development/libraries/wxSVG { wxSVG = callPackage ../development/libraries/wxSVG {