build: update default.nix for macOS and new wx
Update the default.nix, which is used on nixOS and other nix installations for loading the build dependencies into a shell for building. Update the wxWidgets package to wxGTK32, the current version. Add an if statement to check for macOS and load the right package set for it. Building with nix on macOS does not currently work, but the build dependencies do work now. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
This commit is contained in:
parent
f6e3daf9d8
commit
ea5cbba016
|
@ -1,7 +1,8 @@
|
||||||
with import <nixpkgs> {};
|
with import <nixpkgs> {};
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "visualboyadvance-m";
|
name = "visualboyadvance-m";
|
||||||
buildInputs = [ ninja cmake gcc nasm gettext pkg-config zip sfml zlib ffmpeg wxGTK31-gtk3 mesa glfw SDL2 gtk3-x11 pcre util-linuxMinimal libselinux libsepol libthai libdatrie xorg.libXdmcp xorg.libXtst libxkbcommon epoxy dbus at-spi2-core ];
|
buildInputs = if stdenv.isDarwin then
|
||||||
# WIP: Trying to get this to work on mac nix.
|
[ ninja cmake gcc nasm gettext pkg-config zip sfml zlib ffmpeg wxGTK32 SDL2 pcre ]
|
||||||
# buildInputs = [ ninja cmake gcc nasm gettext pkg-config zip sfml zlib ffmpeg wxmac SDL2 pcre ];
|
else
|
||||||
|
[ ninja cmake gcc nasm gettext pkg-config zip sfml zlib ffmpeg wxGTK32 mesa glfw SDL2 gtk3-x11 pcre util-linuxMinimal libselinux libsepol libthai libdatrie xorg.libXdmcp xorg.libXtst libxkbcommon epoxy dbus at-spi2-core ];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue