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

Purge stdenv.cross #26884

Merged
merged 68 commits into from Jun 29, 2017
Merged

Purge stdenv.cross #26884

merged 68 commits into from Jun 29, 2017

Conversation

Ericson2314
Copy link
Member

Motivation for this change

stdenv.cross is vague: better to use buildPlatform, hostPlatform or targetPlatform. This is a rather tedious task so anyone that sees this, feel free to push to this PR (if you are a contributor) or send a PR against the PR (if you are not).

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • 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/)
  • Fits CONTRIBUTING.md.

CC @bjornfor @matthewbauer @Dridus

@Ericson2314 Ericson2314 added 2.status: work-in-progress 6.topic: cross-compilation Building packages on a different sort platform than than they will be run on labels Jun 26, 2017
@mention-bot
Copy link

@Ericson2314, thanks for your PR! By analyzing the history of the files in this pull request, we identified @edolstra, @pSub and @vcunat to be potential reviewers.

Mic92
Mic92 reviewed Jun 27, 2017
View reviewed changes
pkgs/development/libraries/libxml2/default.nix Outdated
, icuSupport ? false, icu ? null }:
}:
Copy link
Member

Choose a reason for hiding this comment

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

closes parentheses twice.

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks; fixed

@Ericson2314
Copy link
Member Author

@bjornfor that's my fault with the sed before the manual fix up. I hope there's a way to filter-branch to fix that....

@bjornfor
Copy link
Contributor

@Ericson2314. No problem. I think you can script the git filter-branch thing.

@Ericson2314
ImageMagick: Don't use stdenv.cross
a11426c 
I'm guessing the salient aspect here is not cross compiling itself, but
just whether the host platform is MinGW, so I simplified the logic
accordingly
@Ericson2314
fbida: cc-wrapper can be relied on to export these env vars
c4443d7
@Ericson2314
offrss: cc-wrapper can be relied on to export this env var
ca94de8
@Ericson2314
fossil: Don't use stdenv.cross
ffa535a
@Ericson2314
omxplayer: Don't use stdenv.cross
9c163ce
@Ericson2314
make-initrd: Don't use stdenv.cross
deb8fae
@Ericson2314
guile: Don't use stdenv.cross
c3c5793
@Ericson2314
lua 5: Don't use stdenv.cross, and use less make flags
5d1e51a 
cc-wrapper will define environment variables matching those now
@Ericson2314
SDL: Don't use stdenv.cross
80a857f
@Ericson2314
scummvm: Don't use stdenv.cross
67b5f39
@Ericson2314
boost: Don't use stdenv.cross, and utilize new platform metadata
fcef0ad
@Ericson2314
ffmpeg: Don't use stdenv.cross
38dbd4b
@Ericson2314
libvpx: Don't use stdenv.cross
5c99b2f
@Ericson2314
glew: Rely on cc-wrapper can to export these env vars
a40ceb2
@Ericson2314
cc-wrapper: Also export env var for windres, when it is present
c23028b
@Ericson2314
openssl: cc-wrapper can be relied on to export these env vars
60eff17
@Ericson2314
vim: cc-wrapper can be relied on to export this env var
aac32fe
@Ericson2314
qt 4.8: Don't use stdenv.cross
f16ee76
@Ericson2314
WIP: optipng: cc-wrapper can be relied on to export these env vars
895c361
hSloan added 16 commits June 28, 2017 21:24
@Ericson2314 Ericson2314 merged commit e1faeb5 into NixOS:master Jun 29, 2017
@Ericson2314 Ericson2314 deleted the purge-stdenv-cross branch June 29, 2017 01:39
@Ericson2314 Ericson2314 mentioned this pull request Jun 30, 2017
Closed
4 tasks
@Ericson2314 Ericson2314 added this to Prior in Cross compilation Oct 30, 2017
@Ericson2314 Ericson2314 changed the title Purge stdenv cross Purge stdenv.cross Jan 31, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Mic92 left review comments

@0xABAB 0xABAB 0xABAB approved these changes

Assignees
No one assigned
Labels
6.topic: cross-compilation Building packages on a different sort platform than than they will be run on
Projects
No open projects
Cross compilation
Prior
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@Ericson2314 @mention-bot @bjornfor @matthewbauer @angerman @Mic92 @vcunat @0xABAB @hSloan