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

Assorted darwin/macOS fixes #45183

Merged
merged 8 commits into from
Aug 17, 2018
Merged

Assorted darwin/macOS fixes #45183

merged 8 commits into from
Aug 17, 2018

Conversation

matthewbauer
Copy link
Member

Motivation for this change

Some changes to fix things on macOS. Effects:

  • wireshark
  • chuck
  • doomseeker
  • v8
  • nodejs
  • libglvnd
  • qca
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.

@matthewbauer
v8: remove xcodebuild patch
d4b453d 
Add xcodebuild commands from xcbuild.
@matthewbauer
nodejs: remove ‘no-xcode’ patches
b421a7d 
now provided by xcbuild
@matthewbauer
libglvnd: build on darwin
7a39b0c
@matthewbauer
treewide: disable some tests broken on darwin
bca8144 
disable checks for:

- cython
- ldap
- tqdm
@matthewbauer
wireshark: fix on darwin
2d63877 
Need CMP0025 to be set. No way to do it from the command
line (overrode by the cmake_minimimum_version policy).

Fixes NixOS#44878
@matthewbauer
qca: fix on darwin
aba9f67
@matthewbauer
doomseeker: fix on darwin
030760a
@matthewbauer
chuck: cleanup
ee92ab0
@GrahamcOfBorg
Copy link

Timed out, unknown build status on x86_64-darwin (full log)

Attempted: chuck, doomseeker, libglvnd, nodejs, v8, wireshark

Partial log (click to expand)

  clang++ '-D_DARWIN_USE_64_BIT_INODE=1' '-DU_I18N_IMPLEMENTATION=1' '-DU_ATTRIBUTE_DEPRECATED=' '-D_CRT_SECURE_NO_DEPRECATE=' '-DU_STATIC_IMPLEMENTATION=1' '-DUCONFIG_NO_SERVICE=1' '-DUCONFIG_NO_REGULAR_EXPRESSIONS=1' '-DU_ENABLE_DYLOAD=0' '-DU_HAVE_STD_STRING=0' '-DUCONFIG_NO_BREAK_ITERATION=0' -I/nix/store/ayzpandgnasbk63m5z3ggifp8w3i58s6-zlib-1.2.11-dev/include -I/nix/store/knvgv3823pn0k4rlwa52zz9i023l4831-libuv-1.21.0/include -I/nix/store/i272jw7l5zlr17gf30fircq1811im5ap-openssl-1.0.2o-dev/include -I../deps/icu-small/source/i18n -I../deps/icu-small/source/common  -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -std=gnu++0x -stdlib=libc++ -fno-exceptions -fno-threadsafe-statics -fno-strict-aliasing -MMD -MF /private/tmp/nix-build-nodejs-8.11.3.drv-0/node-v8.11.3/out/Release/.deps//private/tmp/nix-build-nodejs-8.11.3.drv-0/node-v8.11.3/out/Release/obj.target/icui18n/deps/icu-small/source/i18n/persncal.o.d.raw   -c -o /private/tmp/nix-build-nodejs-8.11.3.drv-0/node-v8.11.3/out/Release/obj.target/icui18n/deps/icu-small/source/i18n/persncal.o ../deps/icu-small/source/i18n/persncal.cpp
  clang++ '-D_DARWIN_USE_64_BIT_INODE=1' '-DU_I18N_IMPLEMENTATION=1' '-DU_ATTRIBUTE_DEPRECATED=' '-D_CRT_SECURE_NO_DEPRECATE=' '-DU_STATIC_IMPLEMENTATION=1' '-DUCONFIG_NO_SERVICE=1' '-DUCONFIG_NO_REGULAR_EXPRESSIONS=1' '-DU_ENABLE_DYLOAD=0' '-DU_HAVE_STD_STRING=0' '-DUCONFIG_NO_BREAK_ITERATION=0' -I/nix/store/ayzpandgnasbk63m5z3ggifp8w3i58s6-zlib-1.2.11-dev/include -I/nix/store/knvgv3823pn0k4rlwa52zz9i023l4831-libuv-1.21.0/include -I/nix/store/i272jw7l5zlr17gf30fircq1811im5ap-openssl-1.0.2o-dev/include -I../deps/icu-small/source/i18n -I../deps/icu-small/source/common  -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -std=gnu++0x -stdlib=libc++ -fno-exceptions -fno-threadsafe-statics -fno-strict-aliasing -MMD -MF /private/tmp/nix-build-nodejs-8.11.3.drv-0/node-v8.11.3/out/Release/.deps//private/tmp/nix-build-nodejs-8.11.3.drv-0/node-v8.11.3/out/Release/obj.target/icui18n/deps/icu-small/source/i18n/ztrans.o.d.raw   -c -o /private/tmp/nix-build-nodejs-8.11.3.drv-0/node-v8.11.3/out/Release/obj.target/icui18n/deps/icu-small/source/i18n/ztrans.o ../deps/icu-small/source/i18n/ztrans.cpp
  clang++ '-D_DARWIN_USE_64_BIT_INODE=1' '-DU_I18N_IMPLEMENTATION=1' '-DU_ATTRIBUTE_DEPRECATED=' '-D_CRT_SECURE_NO_DEPRECATE=' '-DU_STATIC_IMPLEMENTATION=1' '-DUCONFIG_NO_SERVICE=1' '-DUCONFIG_NO_REGULAR_EXPRESSIONS=1' '-DU_ENABLE_DYLOAD=0' '-DU_HAVE_STD_STRING=0' '-DUCONFIG_NO_BREAK_ITERATION=0' -I/nix/store/ayzpandgnasbk63m5z3ggifp8w3i58s6-zlib-1.2.11-dev/include -I/nix/store/knvgv3823pn0k4rlwa52zz9i023l4831-libuv-1.21.0/include -I/nix/store/i272jw7l5zlr17gf30fircq1811im5ap-openssl-1.0.2o-dev/include -I../deps/icu-small/source/i18n -I../deps/icu-small/source/common  -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -std=gnu++0x -stdlib=libc++ -fno-exceptions -fno-threadsafe-statics -fno-strict-aliasing -MMD -MF /private/tmp/nix-build-nodejs-8.11.3.drv-0/node-v8.11.3/out/Release/.deps//private/tmp/nix-build-nodejs-8.11.3.drv-0/node-v8.11.3/out/Release/obj.target/icui18n/deps/icu-small/source/i18n/dtfmtsym.o.d.raw   -c -o /private/tmp/nix-build-nodejs-8.11.3.drv-0/node-v8.11.3/out/Release/obj.target/icui18n/deps/icu-small/source/i18n/dtfmtsym.o ../deps/icu-small/source/i18n/dtfmtsym.cpp
  clang++ '-D_DARWIN_USE_64_BIT_INODE=1' '-DU_I18N_IMPLEMENTATION=1' '-DU_ATTRIBUTE_DEPRECATED=' '-D_CRT_SECURE_NO_DEPRECATE=' '-DU_STATIC_IMPLEMENTATION=1' '-DUCONFIG_NO_SERVICE=1' '-DUCONFIG_NO_REGULAR_EXPRESSIONS=1' '-DU_ENABLE_DYLOAD=0' '-DU_HAVE_STD_STRING=0' '-DUCONFIG_NO_BREAK_ITERATION=0' -I/nix/store/ayzpandgnasbk63m5z3ggifp8w3i58s6-zlib-1.2.11-dev/include -I/nix/store/knvgv3823pn0k4rlwa52zz9i023l4831-libuv-1.21.0/include -I/nix/store/i272jw7l5zlr17gf30fircq1811im5ap-openssl-1.0.2o-dev/include -I../deps/icu-small/source/i18n -I../deps/icu-small/source/common  -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -std=gnu++0x -stdlib=libc++ -fno-exceptions -fno-threadsafe-statics -fno-strict-aliasing -MMD -MF /private/tmp/nix-build-nodejs-8.11.3.drv-0/node-v8.11.3/out/Release/.deps//private/tmp/nix-build-nodejs-8.11.3.drv-0/node-v8.11.3/out/Release/obj.target/icui18n/deps/icu-small/source/i18n/ucsdet.o.d.raw   -c -o /private/tmp/nix-build-nodejs-8.11.3.drv-0/node-v8.11.3/out/Release/obj.target/icui18n/deps/icu-small/source/i18n/ucsdet.o ../deps/icu-small/source/i18n/ucsdet.cpp
  clang++ '-D_DARWIN_USE_64_BIT_INODE=1' '-DU_I18N_IMPLEMENTATION=1' '-DU_ATTRIBUTE_DEPRECATED=' '-D_CRT_SECURE_NO_DEPRECATE=' '-DU_STATIC_IMPLEMENTATION=1' '-DUCONFIG_NO_SERVICE=1' '-DUCONFIG_NO_REGULAR_EXPRESSIONS=1' '-DU_ENABLE_DYLOAD=0' '-DU_HAVE_STD_STRING=0' '-DUCONFIG_NO_BREAK_ITERATION=0' -I/nix/store/ayzpandgnasbk63m5z3ggifp8w3i58s6-zlib-1.2.11-dev/include -I/nix/store/knvgv3823pn0k4rlwa52zz9i023l4831-libuv-1.21.0/include -I/nix/store/i272jw7l5zlr17gf30fircq1811im5ap-openssl-1.0.2o-dev/include -I../deps/icu-small/source/i18n -I../deps/icu-small/source/common  -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -std=gnu++0x -stdlib=libc++ -fno-exceptions -fno-threadsafe-statics -fno-strict-aliasing -MMD -MF /private/tmp/nix-build-nodejs-8.11.3.drv-0/node-v8.11.3/out/Release/.deps//private/tmp/nix-build-nodejs-8.11.3.drv-0/node-v8.11.3/out/Release/obj.target/icui18n/deps/icu-small/source/i18n/collationdatawriter.o.d.raw   -c -o /private/tmp/nix-build-nodejs-8.11.3.drv-0/node-v8.11.3/out/Release/obj.target/icui18n/deps/icu-small/source/i18n/collationdatawriter.o ../deps/icu-small/source/i18n/collationdatawriter.cpp
  clang++ '-D_DARWIN_USE_64_BIT_INODE=1' '-DU_I18N_IMPLEMENTATION=1' '-DU_ATTRIBUTE_DEPRECATED=' '-D_CRT_SECURE_NO_DEPRECATE=' '-DU_STATIC_IMPLEMENTATION=1' '-DUCONFIG_NO_SERVICE=1' '-DUCONFIG_NO_REGULAR_EXPRESSIONS=1' '-DU_ENABLE_DYLOAD=0' '-DU_HAVE_STD_STRING=0' '-DUCONFIG_NO_BREAK_ITERATION=0' -I/nix/store/ayzpandgnasbk63m5z3ggifp8w3i58s6-zlib-1.2.11-dev/include -I/nix/store/knvgv3823pn0k4rlwa52zz9i023l4831-libuv-1.21.0/include -I/nix/store/i272jw7l5zlr17gf30fircq1811im5ap-openssl-1.0.2o-dev/include -I../deps/icu-small/source/i18n -I../deps/icu-small/source/common  -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -std=gnu++0x -stdlib=libc++ -fno-exceptions -fno-threadsafe-statics -fno-strict-aliasing -MMD -MF /private/tmp/nix-build-nodejs-8.11.3.drv-0/node-v8.11.3/out/Release/.deps//private/tmp/nix-build-nodejs-8.11.3.drv-0/node-v8.11.3/out/Release/obj.target/icui18n/deps/icu-small/source/i18n/regextxt.o.d.raw   -c -o /private/tmp/nix-build-nodejs-8.11.3.drv-0/node-v8.11.3/out/Release/obj.target/icui18n/deps/icu-small/source/i18n/regextxt.o ../deps/icu-small/source/i18n/regextxt.cpp
  clang++ '-D_DARWIN_USE_64_BIT_INODE=1' '-DU_I18N_IMPLEMENTATION=1' '-DU_ATTRIBUTE_DEPRECATED=' '-D_CRT_SECURE_NO_DEPRECATE=' '-DU_STATIC_IMPLEMENTATION=1' '-DUCONFIG_NO_SERVICE=1' '-DUCONFIG_NO_REGULAR_EXPRESSIONS=1' '-DU_ENABLE_DYLOAD=0' '-DU_HAVE_STD_STRING=0' '-DUCONFIG_NO_BREAK_ITERATION=0' -I/nix/store/ayzpandgnasbk63m5z3ggifp8w3i58s6-zlib-1.2.11-dev/include -I/nix/store/knvgv3823pn0k4rlwa52zz9i023l4831-libuv-1.21.0/include -I/nix/store/i272jw7l5zlr17gf30fircq1811im5ap-openssl-1.0.2o-dev/include -I../deps/icu-small/source/i18n -I../deps/icu-small/source/common  -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -std=gnu++0x -stdlib=libc++ -fno-exceptions -fno-threadsafe-statics -fno-strict-aliasing -MMD -MF /private/tmp/nix-build-nodejs-8.11.3.drv-0/node-v8.11.3/out/Release/.deps//private/tmp/nix-build-nodejs-8.11.3.drv-0/node-v8.11.3/out/Release/obj.target/icui18n/deps/icu-small/source/i18n/coleitr.o.d.raw   -c -o /private/tmp/nix-build-nodejs-8.11.3.drv-0/node-v8.11.3/out/Release/obj.target/icui18n/deps/icu-small/source/i18n/coleitr.o ../deps/icu-small/source/i18n/coleitr.cpp
  clang++ '-D_DARWIN_USE_64_BIT_INODE=1' '-DU_I18N_IMPLEMENTATION=1' '-DU_ATTRIBUTE_DEPRECATED=' '-D_CRT_SECURE_NO_DEPRECATE=' '-DU_STATIC_IMPLEMENTATION=1' '-DUCONFIG_NO_SERVICE=1' '-DUCONFIG_NO_REGULAR_EXPRESSIONS=1' '-DU_ENABLE_DYLOAD=0' '-DU_HAVE_STD_STRING=0' '-DUCONFIG_NO_BREAK_ITERATION=0' -I/nix/store/ayzpandgnasbk63m5z3ggifp8w3i58s6-zlib-1.2.11-dev/include -I/nix/store/knvgv3823pn0k4rlwa52zz9i023l4831-libuv-1.21.0/include -I/nix/store/i272jw7l5zlr17gf30fircq1811im5ap-openssl-1.0.2o-dev/include -I../deps/icu-small/source/i18n -I../deps/icu-small/source/common  -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -std=gnu++0x -stdlib=libc++ -fno-exceptions -fno-threadsafe-statics -fno-strict-aliasing -MMD -MF /private/tmp/nix-build-nodejs-8.11.3.drv-0/node-v8.11.3/out/Release/.deps//private/tmp/nix-build-nodejs-8.11.3.drv-0/node-v8.11.3/out/Release/obj.target/icui18n/deps/icu-small/source/i18n/csrutf8.o.d.raw   -c -o /private/tmp/nix-build-nodejs-8.11.3.drv-0/node-v8.11.3/out/Release/obj.target/icui18n/deps/icu-small/source/i18n/csrutf8.o ../deps/icu-small/source/i18n/csrutf8.cpp
building of '/nix/store/fy3izdici2h23dfd2lz5m3q8whnfngq9-nodejs-8.11.3.drv' timed out after 1800 seconds
error: build of '/nix/store/fy3izdici2h23dfd2lz5m3q8whnfngq9-nodejs-8.11.3.drv' failed

@GrahamcOfBorg
Copy link

Timed out, unknown build status on aarch64-linux (full log)

Attempted: chuck, doomseeker, libglvnd, nodejs, v8, wireshark

Partial log (click to expand)

cannot build derivation '/nix/store/g6wksp4rnlfmmxbk0mfn7mva900rsw6k-qttools-5.9.3.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/na89z15650x4iz8sdi2pgl8n80m12gcg-qtxmlpatterns-5.11.1.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/5vx7n6jznq4cp6qlmbk14rsj6m8773r0-qtxmlpatterns-5.9.3.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/hmvcpqzmwawi27lc29616hwzsjzrh8d1-qtdeclarative-5.11.1.drv': 4 dependencies couldn't be built
cannot build derivation '/nix/store/3xj6skrw25803c4liybzw41xjn0jzx4p-qtdeclarative-5.9.3.drv': 4 dependencies couldn't be built
cannot build derivation '/nix/store/5g5b3azmig0irwa321zhri5xc7s2kpzd-qtmultimedia-5.11.1.drv': 6 dependencies couldn't be built
cannot build derivation '/nix/store/ac96nyabqx8qra1byk8q20399492ap9f-qtmultimedia-5.9.3.drv': 6 dependencies couldn't be built
cannot build derivation '/nix/store/mph5hdb0gvcbhlmjhgb1f4vnsdiqfm0y-doomseeker-2018-03-05.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/gc1zd13652dr3dybbrkma03bz77pccmb-wireshark-qt-2.6.2.drv': 4 dependencies couldn't be built
error: build of '/nix/store/gc1zd13652dr3dybbrkma03bz77pccmb-wireshark-qt-2.6.2.drv', '/nix/store/mph5hdb0gvcbhlmjhgb1f4vnsdiqfm0y-doomseeker-2018-03-05.drv' failed

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: chuck, doomseeker, libglvnd, nodejs, v8, wireshark

Partial log (click to expand)

shrinking /nix/store/b8c9z6758zvnd6hhh3y6yv5nb5wwrhsm-wireshark-qt-2.6.2/lib/wireshark/plugins/2.6/epan/stats_tree.so
shrinking /nix/store/b8c9z6758zvnd6hhh3y6yv5nb5wwrhsm-wireshark-qt-2.6.2/lib/wireshark/plugins/2.6/epan/wimaxasncp.so
shrinking /nix/store/b8c9z6758zvnd6hhh3y6yv5nb5wwrhsm-wireshark-qt-2.6.2/lib/libwireshark.so.11.1.2
shrinking /nix/store/b8c9z6758zvnd6hhh3y6yv5nb5wwrhsm-wireshark-qt-2.6.2/lib/libwscodecs.so.2.0.0
gzipping man pages under /nix/store/b8c9z6758zvnd6hhh3y6yv5nb5wwrhsm-wireshark-qt-2.6.2/share/man/
strip is /nix/store/gpc2wld1s0c6qzx9326cwn1wcx29xzsj-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/b8c9z6758zvnd6hhh3y6yv5nb5wwrhsm-wireshark-qt-2.6.2/lib  /nix/store/b8c9z6758zvnd6hhh3y6yv5nb5wwrhsm-wireshark-qt-2.6.2/bin
patching script interpreter paths in /nix/store/b8c9z6758zvnd6hhh3y6yv5nb5wwrhsm-wireshark-qt-2.6.2
checking for references to /build in /nix/store/b8c9z6758zvnd6hhh3y6yv5nb5wwrhsm-wireshark-qt-2.6.2...
postPatchMkspecs

@matthewbauer matthewbauer changed the base branch from master to staging August 17, 2018 15:28
@matthewbauer matthewbauer changed the base branch from staging to staging-next August 17, 2018 15:28
@matthewbauer matthewbauer merged commit 4ff7702 into NixOS:staging-next Aug 17, 2018
LnL7
LnL7 reviewed Aug 17, 2018
View reviewed changes
pkgs/development/libraries/v8/default.nix
@@ -124,13 +124,7 @@ stdenv.mkDerivation rec {

# Patch based off of:
# https://github.com/cowboyd/libv8/tree/v5.1.281.67.0/patches
patches = lib.optional (!doCheck) ./libv8-5.4.232.patch
++ stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode.patch ];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Guess maybe it's not worth maintaining this, but in general I think we should try to avoid xcbuild (if it's reasonable to do so) and stay as close as possible to the linux builds.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, my thinking here is less patches, less maintenence. In chromium-based things like v8 & node, xcode is used but only for picking up the sdk version, I think. Ideally we wouldn't need it at all but that's kind of upstream's problem.

@matthewbauer matthewbauer deleted the macdevelop branch February 22, 2019 04:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LnL7 LnL7 LnL7 left review comments

@FRidh FRidh Awaiting requested review from FRidh

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 6.topic: python 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 101-500 10.rebuild-linux: 501+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@matthewbauer @GrahamcOfBorg @LnL7