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:
@@ -8,7 +8,6 @@
|
||||
|
||||
, gpm
|
||||
|
||||
, buildPlatform, hostPlatform
|
||||
, buildPackages
|
||||
}:
|
||||
|
||||
@@ -36,7 +35,7 @@ stdenv.mkDerivation rec {
|
||||
] ++ lib.optional unicode "--enable-widec"
|
||||
++ lib.optional (!withCxx) "--without-cxx"
|
||||
++ lib.optional (abiVersion == "5") "--with-abi-version=5"
|
||||
++ lib.optionals hostPlatform.isWindows [
|
||||
++ lib.optionals stdenv.hostPlatform.isWindows [
|
||||
"--enable-sp-funcs"
|
||||
"--enable-term-driver"
|
||||
];
|
||||
@@ -47,7 +46,7 @@ stdenv.mkDerivation rec {
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
nativeBuildInputs = [
|
||||
pkgconfig
|
||||
] ++ lib.optionals (buildPlatform != hostPlatform) [
|
||||
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
|
||||
buildPackages.ncurses
|
||||
];
|
||||
buildInputs = lib.optional (mouseSupport && stdenv.isLinux) gpm;
|
||||
@@ -137,7 +136,7 @@ stdenv.mkDerivation rec {
|
||||
moveToOutput "bin/infotocap" "$out"
|
||||
'';
|
||||
|
||||
preFixup = lib.optionalString (!hostPlatform.isCygwin && !enableStatic) ''
|
||||
preFixup = lib.optionalString (!stdenv.hostPlatform.isCygwin && !enableStatic) ''
|
||||
rm "$out"/lib/*.a
|
||||
'';
|
||||
|
||||
|
||||
Reference in New Issue
Block a user