treewide: Remove usage of remaining redundant platform compatability stuff
Want to get this out of here for 18.09, so it can be deprecated thereafter.
This commit is contained in:
@@ -1,5 +1,4 @@
|
||||
{ stdenv, buildPackages
|
||||
, buildPlatform, hostPlatform
|
||||
, fetchurl, makeWrapper, gawk, pkgconfig
|
||||
, libtool, readline, gmp
|
||||
}:
|
||||
@@ -23,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
"--with-threads=no";
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ]
|
||||
++ stdenv.lib.optional (hostPlatform != buildPlatform)
|
||||
++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
|
||||
buildPackages.buildPackages.guile_1_8;
|
||||
nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
|
||||
buildInputs = [ readline libtool ];
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ stdenv, buildPackages
|
||||
, buildPlatform, hostPlatform
|
||||
, fetchpatch, fetchurl, makeWrapper, gawk, pkgconfig
|
||||
, libffi, libtool, readline, gmp, boehmgc, libunistring
|
||||
, coverageAnalysis ? null
|
||||
@@ -22,7 +21,7 @@
|
||||
setOutputFlags = false; # $dev gets into the library otherwise
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ]
|
||||
++ stdenv.lib.optional (hostPlatform != buildPlatform)
|
||||
++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
|
||||
buildPackages.buildPackages.guile_2_0;
|
||||
nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
|
||||
buildInputs = [ readline libtool libunistring libffi ];
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ stdenv, buildPackages
|
||||
, buildPlatform, hostPlatform
|
||||
, fetchurl, makeWrapper, gawk, pkgconfig
|
||||
, libffi, libtool, readline, gmp, boehmgc, libunistring
|
||||
, coverageAnalysis ? null
|
||||
@@ -23,7 +22,7 @@
|
||||
setOutputFlags = false; # $dev gets into the library otherwise
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ]
|
||||
++ stdenv.lib.optional (hostPlatform != buildPlatform)
|
||||
++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
|
||||
buildPackages.buildPackages.guile;
|
||||
nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
|
||||
buildInputs = [ readline libtool libunistring libffi ];
|
||||
|
||||
Reference in New Issue
Block a user