mirror of
https://github.com/lihop/godot-xterm.git
synced 2024-11-12 21:50:26 +01:00
Remove cross-compilation dependencies
It makes the github actions workflow take longer and cross-compiled artifacts are not currently used (nor do they seem to work).
This commit is contained in:
parent
570896b9c0
commit
6689ad1c09
3 changed files with 5 additions and 36 deletions
|
@ -1,22 +1,9 @@
|
||||||
# Use --argstr system i686-linux to build for 32-bit linux.
|
with (import <nixpkgs> {});
|
||||||
{ system ? builtins.currentSystem }:
|
|
||||||
with (import <nixpkgs> {
|
|
||||||
inherit system;
|
|
||||||
});
|
|
||||||
mkShell {
|
mkShell {
|
||||||
buildInputs = with pkgs; [
|
buildInputs = with pkgs; [
|
||||||
binutils.bintools
|
|
||||||
cacert
|
|
||||||
cmake
|
|
||||||
git
|
git
|
||||||
libxkbcommon
|
|
||||||
nix
|
|
||||||
pkg-config
|
|
||||||
scons
|
scons
|
||||||
] ++ lib.optionals (system == builtins.currentSystem) [
|
|
||||||
# Additional dependencies for cross-compiling for Windows and OSX.
|
cacert # Required for git clone on GithHub actions runner.
|
||||||
clang
|
|
||||||
pkgsCross.mingwW64.buildPackages.gcc
|
|
||||||
pkgsCross.mingw32.buildPackages.gcc
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,14 +1,6 @@
|
||||||
FROM archlinux:20200908
|
FROM archlinux:20200908
|
||||||
RUN pacman -Sy --needed --noconfirm \
|
RUN pacman -Sy --needed --noconfirm \
|
||||||
# The following are required to compile for any platform:
|
|
||||||
git \
|
git \
|
||||||
scons \
|
scons \
|
||||||
# The following are required to compile for 64-bit Linux:
|
base-devel
|
||||||
base-devel \
|
|
||||||
# The following are required to compile for 32-bit Linux:
|
|
||||||
multilib-devel \
|
|
||||||
# The following is required to cross-compile for 32/64-bit Windows:
|
|
||||||
mingw-w64-gcc \
|
|
||||||
# The following is required to cross-compile for MacOS:
|
|
||||||
clang
|
|
||||||
COPY . /src
|
COPY . /src
|
||||||
|
|
|
@ -1,16 +1,6 @@
|
||||||
FROM ubuntu:18.04
|
FROM ubuntu:18.04
|
||||||
RUN apt-get update && apt-get install -y \
|
RUN apt-get update && apt-get install -y \
|
||||||
# The following are required to compile for any platform:
|
|
||||||
git \
|
git \
|
||||||
python3 \
|
|
||||||
scons \
|
scons \
|
||||||
# The following are required to compile for 64-bit Linux:
|
build-essential
|
||||||
build-essential \
|
|
||||||
# The following are required to compile for 32-bit Linux:
|
|
||||||
gcc-multilib \
|
|
||||||
g++-multilib \
|
|
||||||
# The following is required to cross-compile for 32/64-bit Windows:
|
|
||||||
g++-mingw-w64-x86-64 \
|
|
||||||
# The following is required to cross-compile for MacOS:
|
|
||||||
clang
|
|
||||||
COPY . /src
|
COPY . /src
|
||||||
|
|
Loading…
Reference in a new issue