public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: Get rid of all uses of crossConfig

Browse Source 
The hack of using `crossConfig` to enforce stricter handling of
dependencies is replaced with a dedicated `strictDeps` for that purpose.
(Experience has shown that my punning was a terrible idea that made more
difficult and embarrising to teach teach.)

Now that is is clear, a few packages now use `strictDeps`, to fix
various bugs:

 - bintools-wrapper and cc-wrapper
This commit is contained in:
John Ericson
2018-05-13 11:31:24 -04:00
parent d7160f39bd
commit 330ca731e8
22 changed files with 111 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/compilers/ghc/7.10.3.nix
View File

@@ -129,10 +129,8 @@ stdenv.mkDerivation rec {
"--disable-large-address-space"
];
# Hack to make sure we never to the relaxation `$PATH` and hooks support for
# compatability. This will be replaced with something clearer in a future
# masss-rebuild.
crossConfig = true;
# Make sure we never relax`$PATH` and hooks support for compatability.
strictDeps = true;
nativeBuildInputs = [
ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour

6
pkgs/development/compilers/ghc/8.0.2.nix
View File

@@ -128,10 +128,8 @@ stdenv.mkDerivation rec {
"--disable-large-address-space"
];
# Hack to make sure we never to the relaxation `$PATH` and hooks support for
# compatability. This will be replaced with something clearer in a future
# masss-rebuild.
crossConfig = true;
# Make sure we never relax`$PATH` and hooks support for compatability.
strictDeps = true;
nativeBuildInputs = [ ghc perl hscolour sphinx ];

6
pkgs/development/compilers/ghc/8.2.2.nix
View File

@@ -145,10 +145,8 @@ stdenv.mkDerivation rec {
"--disable-large-address-space"
];
# Hack to make sure we never to the relaxation `$PATH` and hooks support for
# compatability. This will be replaced with something clearer in a future
# masss-rebuild.
crossConfig = true;
# Make sure we never relax`$PATH` and hooks support for compatability.
strictDeps = true;
nativeBuildInputs = [ alex autoconf autoreconfHook automake ghc happy hscolour perl python3 sphinx ];

6
pkgs/development/compilers/ghc/8.4.1.nix
View File

@@ -144,10 +144,8 @@ stdenv.mkDerivation rec {
"--disable-large-address-space"
];
# Hack to make sure we never to the relaxation `$PATH` and hooks support for
# compatability. This will be replaced with something clearer in a future
# masss-rebuild.
crossConfig = true;
# Make sure we never relax`$PATH` and hooks support for compatability.
strictDeps = true;
nativeBuildInputs = [ ghc perl autoconf automake happy alex python3 ];

6
pkgs/development/compilers/ghc/head.nix
View File

@@ -134,10 +134,8 @@ stdenv.mkDerivation rec {
"--disable-large-address-space"
];
# Hack to make sure we never to the relaxation `$PATH` and hooks support for
# compatability. This will be replaced with something clearer in a future
# masss-rebuild.
crossConfig = true;
# Make sure we never relax`$PATH` and hooks support for compatability.
strictDeps = true;
nativeBuildInputs = [ ghc perl autoconf automake happy alex python3 ];