Skip to content

Commit 16be434

Browse files
Ericson2314Ericson2314
committedJun 29, 2017
Merge accepted cross compilation PRs into staging
2 parents d76bc8e + b0ada07 commit 16be434

File tree

83 files changed

+308
-347
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+308
-347
lines changed
 

‎doc/cross-compilation.xml

-5
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,6 @@
7979
</listitem>
8080
</varlistentry>
8181
</variablelist>
82-
<note><para>
83-
If you dig around nixpkgs, you may notice there is also <varname>stdenv.cross</varname>.
84-
This field defined as <varname>hostPlatform</varname> when the host and build platforms differ, but otherwise not defined at all.
85-
This field is obsolete and will soon disappear—please do not use it.
86-
</para></note>
8782
<para>
8883
The exact schema these fields follow is a bit ill-defined due to a long and convoluted evolution, but this is slowly being cleaned up.
8984
You can see examples of ones used in practice in <literal>lib.systems.examples</literal>; note how they are not all very consistent.

‎pkgs/applications/editors/vim/default.nix

-3
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ stdenv.mkDerivation rec {
3636
"ac_cv_sizeof_int=4"
3737
"vim_cv_memmove_handles_overlap=yes"
3838
"vim_cv_memmove_handles_overlap=yes"
39-
40-
# TODO(@Ericson2314): wont' be needed soon.
41-
"STRIP=${hostPlatform.config}-strip"
4239
];
4340

4441
postInstall = ''

0 commit comments

Comments
 (0)
Please sign in to comment.