diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-10-24 12:07:50 +0200 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2018-10-24 12:07:50 +0200 |
| commit | 0df3d8d6c40f3c323fece42b283f45227f5ea88e (patch) | |
| tree | 6fbf737ac662262a7b40bb15a358b3c716666507 /pkgs/development/libraries/wxwidgets | |
| parent | 0fcd2ca7b2e313f88687037a835555b31a0892b6 (diff) | |
| download | nixpkgs-0df3d8d6c40f3c323fece42b283f45227f5ea88e.tar nixpkgs-0df3d8d6c40f3c323fece42b283f45227f5ea88e.tar.gz nixpkgs-0df3d8d6c40f3c323fece42b283f45227f5ea88e.tar.bz2 nixpkgs-0df3d8d6c40f3c323fece42b283f45227f5ea88e.tar.lz nixpkgs-0df3d8d6c40f3c323fece42b283f45227f5ea88e.tar.xz nixpkgs-0df3d8d6c40f3c323fece42b283f45227f5ea88e.tar.zst nixpkgs-0df3d8d6c40f3c323fece42b283f45227f5ea88e.zip | |
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 )
Diffstat (limited to 'pkgs/development/libraries/wxwidgets')
| -rw-r--r-- | pkgs/development/libraries/wxwidgets/3.0/mac.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/development/libraries/wxwidgets/3.0/mac.nix b/pkgs/development/libraries/wxwidgets/3.0/mac.nix index 9c307b2d15a..a13ade3bb74 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/mac.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/mac.nix @@ -1,11 +1,9 @@ { stdenv, fetchurl, fetchpatch, expat, libiconv, libjpeg, libpng, libtiff, zlib # darwin only attributes -, derez, rez, setfile +, cf-private, derez, rez, setfile , AGL, Cocoa, Kernel }: -with stdenv.lib; - stdenv.mkDerivation rec { version = "3.0.2"; name = "wxmac-${version}"; @@ -55,6 +53,10 @@ stdenv.mkDerivation rec { expat libiconv libjpeg libpng libtiff zlib derez rez setfile 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 ]; @@ -98,7 +100,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { platforms = platforms.darwin; license = licenses.wxWindows; maintainers = [ maintainers.lnl7 ]; |