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

treewide: Remove some crossAttrs #44065

Merged
merged 6 commits into from Jul 24, 2018
Merged

treewide: Remove some crossAttrs #44065

merged 6 commits into from Jul 24, 2018

Conversation

Ericson2314
Copy link
Member

Motivation for this change

Progress towards #33302. Packages here picked so as to not cause a mass-rebuild.

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.

@Ericson2314 Ericson2314 added this to @bgamari's and @dtzWill's numerous fixes in Cross compilation Jul 24, 2018
@Ericson2314 Ericson2314 merged commit d4f5ee8 into NixOS:master Jul 24, 2018
@Ericson2314 Ericson2314 deleted the no-crossAttrs-master branch July 24, 2018 22:30
@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: nlohmann_json, prboom

Partial log (click to expand)

-- Installing: /nix/store/7g685wwh0zvgdj0y261ymm07zdhgqkqd-nlohmann_json-3.1.2/lib/cmake/nlohmann_json/nlohmann_jsonConfigVersion.cmake
-- Installing: /nix/store/7g685wwh0zvgdj0y261ymm07zdhgqkqd-nlohmann_json-3.1.2/lib/cmake/nlohmann_json/nlohmann_jsonTargets.cmake
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/7g685wwh0zvgdj0y261ymm07zdhgqkqd-nlohmann_json-3.1.2
strip is /nix/store/a245zacjzf3qw0davhvlfarihcy2yyrc-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/7g685wwh0zvgdj0y261ymm07zdhgqkqd-nlohmann_json-3.1.2/lib
patching script interpreter paths in /nix/store/7g685wwh0zvgdj0y261ymm07zdhgqkqd-nlohmann_json-3.1.2
checking for references to /build in /nix/store/7g685wwh0zvgdj0y261ymm07zdhgqkqd-nlohmann_json-3.1.2...
/nix/store/7g685wwh0zvgdj0y261ymm07zdhgqkqd-nlohmann_json-3.1.2
/nix/store/q83rp4g021vw0pgs50dds3gv36jsgj8n-prboom-2.5.0

@Ericson2314 Ericson2314 added the 6.topic: cross-compilation Building packages on a different sort platform than than they will be run on label Jul 24, 2018
@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: nlohmann_json, prboom

Partial log (click to expand)

-- Installing: /nix/store/5022gzwr7by6jva3256azvd5f4vkjj77-nlohmann_json-3.1.2/lib/cmake/nlohmann_json/nlohmann_jsonConfigVersion.cmake
-- Installing: /nix/store/5022gzwr7by6jva3256azvd5f4vkjj77-nlohmann_json-3.1.2/lib/cmake/nlohmann_json/nlohmann_jsonTargets.cmake
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/5022gzwr7by6jva3256azvd5f4vkjj77-nlohmann_json-3.1.2
strip is /nix/store/a3nk8z2i7m7wa3jdckgv710n7j3yx4b5-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/5022gzwr7by6jva3256azvd5f4vkjj77-nlohmann_json-3.1.2/lib
patching script interpreter paths in /nix/store/5022gzwr7by6jva3256azvd5f4vkjj77-nlohmann_json-3.1.2
checking for references to /build in /nix/store/5022gzwr7by6jva3256azvd5f4vkjj77-nlohmann_json-3.1.2...
/nix/store/5022gzwr7by6jva3256azvd5f4vkjj77-nlohmann_json-3.1.2
/nix/store/zfziac57wd5nxmxna5mzfbnw3hpg47pv-prboom-2.5.0

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: nlohmann_json, prboom

Partial log (click to expand)

checking for snprintf... yes
checking for vsnprintf... yes
checking for mmap... yes
checking for usleep... yes
checking for sched_setaffinity... no
checking for pow in -lm... yes
checking for OpenGL support... yes
checking for sdl-config... /nix/store/6wyj5sfs8pm5iq7yx9mnza1w0z5h552h-SDL-1.2.15-dev/bin/sdl-config
building of '/nix/store/nyczly0bjykm5s4a3lvffvk1dfcqp53q-prboom-2.5.0.drv' timed out after 3600 seconds
�[31;1merror:�[0m build of '/nix/store/nyczly0bjykm5s4a3lvffvk1dfcqp53q-prboom-2.5.0.drv' failed

dezgeg
dezgeg reviewed Jul 25, 2018
View reviewed changes
pkgs/development/libraries/nlohmann_json/default.nix
@@ -15,17 +15,16 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [ cmake ];

doCheck = true;
doCheck = stdenv.buildPlatform == stdenv.hostPlatform;
Copy link
Contributor

Choose a reason for hiding this comment

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

That's redundant.

@dezgeg
Copy link
Contributor

dezgeg commented Jul 25, 2018

Were these tested by cross-building them somehow?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dezgeg dezgeg dezgeg left review comments

Assignees
No one assigned
Labels
6.topic: cross-compilation Building packages on a different sort platform than than they will be run on 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
No open projects
Cross compilation
@bgamari's and @dtzWill's num...
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Ericson2314 @GrahamcOfBorg @dezgeg