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/top-level/all-packages.nix | |
parent | 0fcd2ca7b2e313f88687037a835555b31a0892b6 (diff) | |
download | nixlib-0df3d8d6c40f3c323fece42b283f45227f5ea88e.tar nixlib-0df3d8d6c40f3c323fece42b283f45227f5ea88e.tar.gz nixlib-0df3d8d6c40f3c323fece42b283f45227f5ea88e.tar.bz2 nixlib-0df3d8d6c40f3c323fece42b283f45227f5ea88e.tar.lz nixlib-0df3d8d6c40f3c323fece42b283f45227f5ea88e.tar.xz nixlib-0df3d8d6c40f3c323fece42b283f45227f5ea88e.tar.zst nixlib-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/top-level/all-packages.nix')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 41383f055567..bb2e40952b4a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12692,6 +12692,7 @@ with pkgs; wxmac = callPackage ../development/libraries/wxwidgets/3.0/mac.nix { inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel; inherit (darwin.stubs) setfile rez derez; + inherit (darwin) cf-private; }; wxSVG = callPackage ../development/libraries/wxSVG { @@ -21133,7 +21134,7 @@ with pkgs; liblapackWithAtlas = liblapack; liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { }; - + lrs = callPackage ../development/libraries/science/math/lrs { }; m4ri = callPackage ../development/libraries/science/math/m4ri { }; |