diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-11-11 09:23:16 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-11-11 09:25:07 +0100 |
| commit | 8559b6db82e91963a8805aa01e9b4ef234ad38db (patch) | |
| tree | f6c7212f62d9d5d6ec3f0654e177237054269c6e /pkgs/os-specific/darwin | |
| parent | ac522cbe95c909507cb113d1f7133d80b9c381a1 (diff) | |
| parent | 2b2088ef32d2b111d15a4f04e2211e3784e4111d (diff) | |
| download | nixlib-8559b6db82e91963a8805aa01e9b4ef234ad38db.tar nixlib-8559b6db82e91963a8805aa01e9b4ef234ad38db.tar.gz nixlib-8559b6db82e91963a8805aa01e9b4ef234ad38db.tar.bz2 nixlib-8559b6db82e91963a8805aa01e9b4ef234ad38db.tar.lz nixlib-8559b6db82e91963a8805aa01e9b4ef234ad38db.tar.xz nixlib-8559b6db82e91963a8805aa01e9b4ef234ad38db.tar.zst nixlib-8559b6db82e91963a8805aa01e9b4ef234ad38db.zip | |
Merge branch 'master' into staging
A couple thousand rebuilds from master.
Diffstat (limited to 'pkgs/os-specific/darwin')
| -rw-r--r-- | pkgs/os-specific/darwin/cf-private/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/os-specific/darwin/opencflite/default.nix | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/os-specific/darwin/cf-private/default.nix b/pkgs/os-specific/darwin/cf-private/default.nix index f8c25339370b..603c0f652b01 100644 --- a/pkgs/os-specific/darwin/cf-private/default.nix +++ b/pkgs/os-specific/darwin/cf-private/default.nix @@ -7,12 +7,14 @@ stdenv.mkDerivation { dest=$out/Library/Frameworks/CoreFoundation.framework/Headers mkdir -p $dest pushd $dest - cp -Lv ${osx_private_sdk}/include/CoreFoundationPrivateHeaders/* $dest for file in ${CF}/Library/Frameworks/CoreFoundation.framework/Headers/*; do - ln -sf $file + ln -sf $file done - popd + # Copy or overwrite private headers, some of these might already + # exist in CF but the private versions have more information. + cp -Lfv ${osx_private_sdk}/include/CoreFoundationPrivateHeaders/* $dest + popd ''; setupHook = ./setup-hook.sh; diff --git a/pkgs/os-specific/darwin/opencflite/default.nix b/pkgs/os-specific/darwin/opencflite/default.nix index 4b32697c6ae2..09a346e4446d 100644 --- a/pkgs/os-specific/darwin/opencflite/default.nix +++ b/pkgs/os-specific/darwin/opencflite/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "Cross platform port of the macOS CoreFoundation"; - homepage = http://sourceforge.net/projects/opencflite/; + homepage = https://sourceforge.net/projects/opencflite/; license = stdenv.lib.licenses.apsl20; }; } |