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

Merge pull request #198552 from wegank/wxgtk-games

Browse Source
This commit is contained in:
Sandro
2022-11-24 14:21:25 +01:00
committed by GitHub
parent 7abad9f4b7 faa599ced6
commit 2ca694f473
15 changed files with 419 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/audio/sooperlooper/default.nix
+10 -4
View File
@@ -1,4 +1,5 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, autoreconfHook
, pkg-config
@@ -8,7 +9,7 @@
, libxml2
, libjack2
, libsndfile
, wxGTK30
, wxGTK30-gtk3
, libsigcxx
, libsamplerate
, rubberband
@@ -34,14 +35,19 @@ stdenv.mkDerivation rec {
./autogen.sh
'';
nativeBuildInputs = [ autoreconfHook pkg-config which libtool ];
nativeBuildInputs = [
autoreconfHook
pkg-config
which
libtool
];
buildInputs = [
liblo
libxml2
libjack2
libsndfile
wxGTK30
wxGTK30-gtk3
libsigcxx
libsamplerate
rubberband
pkgs/applications/backup/urbackup-client/default.nix
+18 -5
View File
@@ -1,16 +1,29 @@
{ stdenv, lib, fetchzip, wxGTK30, zlib, zstd }:
{ stdenv
, lib
, fetchzip
, wxGTK32
, zlib
, zstd
}:
stdenv.mkDerivation rec {
pname = "urbackup-client";
version = "2.4.11";
version = "2.5.20";
src = fetchzip {
url = "https://hndl.urbackup.org/Client/${version}/urbackup-client-${version}.tar.gz";
sha256 = "0cciy9v1pxj9qaklpbhp2d5rdbkmfm74vhpqx6b4phww0f10wvzh";
sha256 = "sha256-i1g3xUhspqQRfIUhy6STOWNuncK3tMFocJw652r1X9g=";
};
configureFlags = [ "--enable-embedded-cryptopp" ];
buildInputs = [ wxGTK30 zlib zstd ];
buildInputs = [
wxGTK32
zlib
zstd
];
configureFlags = [
"--enable-embedded-cryptopp"
];
meta = with lib; {
description = "An easy to setup Open Source client/server backup system";
pkgs/applications/emulators/dolphin-emu/default.nix
+24 -20
View File
@@ -6,7 +6,7 @@
, bluez
, ffmpeg
, libao
, gtk2
, gtk3
, glib
, libGLU
, libGL
@@ -21,7 +21,7 @@
, fetchFromGitHub
, libusb1
, libevdev
, wxGTK30
, wxGTK30-gtk3
, soundtouch
, miniupnpc
, mbedtls
@@ -43,29 +43,33 @@ stdenv.mkDerivation rec {
};
patches = [
# Fix build with soundtouch 2.1.2
# Fix FTBFS with glibc 2.26
(fetchpatch {
url = "https://src.fedoraproject.org/rpms/dolphin-emu/raw/a1b91fdf94981e12c8889a02cba0ec2267d0f303/f/dolphin-emu-5.0-soundtouch-exception-fix.patch";
name = "dolphin-emu-5.0-soundtouch-exception-fix.patch";
sha256 = "0yd3l46nja5qiknnl30ryad98f3v8911jwnr67hn61dzx2kwbbaw";
url = "https://salsa.debian.org/games-team/dolphin-emu/raw/8c952b1fcd46259e9d8cce836df433e0a8b88f8c/debian/patches/02_glibc-2.26.patch";
name = "02_glibc-2.26.patch";
sha256 = "sha256-LBXT3rf5klwmX9YQXt4/iv06GghsWZprNhLGYlKiDqk=";
})
# Fix build with gcc 8
# Fix FTBFS with GCC 8
(fetchpatch {
url = "https://salsa.debian.org/games-team/dolphin-emu/raw/9b7b4aeac1b60dcf28bdcafbed6bc498b2aeb0ad/debian/patches/03_gcc8.patch";
url = "https://salsa.debian.org/games-team/dolphin-emu/raw/8c952b1fcd46259e9d8cce836df433e0a8b88f8c/debian/patches/03_gcc8.patch";
name = "03_gcc8.patch";
sha256 = "1da95gb8c95kd5cjhdvg19cv2z863lj3va5gx3bqc7g8r36glqxr";
sha256 = "sha256-uWP6zMjoHYbX6K+oPSQdBn2xWQpvNyhZabMkhtYrSbU=";
})
# Fix FTBFS with SoundTouch 2.1.2
(fetchpatch {
url = "https://salsa.debian.org/games-team/dolphin-emu/raw/8c952b1fcd46259e9d8cce836df433e0a8b88f8c/debian/patches/05_soundtouch-2.1.2.patch";
name = "05_soundtouch-2.1.2.patch";
sha256 = "sha256-Y7CNM6GQC9GRhlOBLZlxkIpj1CFhIwA5L8lGXur/bwY=";
})
# Use GTK+3 wxWidgets backend
(fetchpatch {
url = "https://salsa.debian.org/games-team/dolphin-emu/raw/8c952b1fcd46259e9d8cce836df433e0a8b88f8c/debian/patches/06_gtk3.patch";
name = "06_gtk3.patch";
sha256 = "sha256-pu5Q0+8kNwmpf2DoXCXHFqxF0EGTnFXJipkBz1Vh2cs=";
})
];
postPatch = ''
substituteInPlace Source/Core/VideoBackends/OGL/RasterFont.cpp \
--replace " CHAR_WIDTH " " CHARWIDTH "
'';
cmakeFlags = [
"-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
"-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
"-DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0"
"-DENABLE_LTO=True"
];
@@ -80,7 +84,7 @@ stdenv.mkDerivation rec {
libao
libGLU
libGL
gtk2
gtk3
glib
gettext
libpthreadstubs
@@ -97,7 +101,7 @@ stdenv.mkDerivation rec {
portaudio
libusb1
libpulseaudio
wxGTK30
wxGTK30-gtk3
soundtouch
miniupnpc
mbedtls
@@ -117,6 +121,6 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ MP2E ashkitten ];
# x86_32 is an unsupported platform.
# Enable generic build if you really want a JIT-less binary.
platforms = [ "x86_64-linux" ];
platforms = [ "x86_64-linux" "aarch64-linux" ];
};
}
pkgs/applications/misc/flamerobin/default.nix
+24 -10
View File
@@ -1,26 +1,40 @@
{ lib, stdenv, fetchFromGitHub, wxGTK30, boost, firebird }:
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
, wxGTK32
, boost
, firebird
}:
stdenv.mkDerivation rec {
version = "0.9.3.1";
version = "0.9.3.12";
pname = "flamerobin";
src = fetchFromGitHub {
owner = "mariuz";
repo = "flamerobin";
rev = version;
sha256 = "1wwcsca01hpgi9z5flvbdhs9zv7jvahnbn97j6ymy0hdyb8lv6si";
sha256 = "sha256-uWx3riRc79VKh7qniWFjxxc7v6l6cW0i31HxoN1BSdA=";
};
patches = [
# rely on compiler command line for __int128 and std::decimal::decimal128
(fetchpatch {
url = "https://github.com/mariuz/flamerobin/commit/8e0ea6d42aa28a4baeaa8c8b8b57c56eb9ae3540.patch";
sha256 = "sha256-l6LWXA/sRQGQKi798bzl0iIJ2vdvXHOjG7wdFSXv+NM=";
})
];
enableParallelBuilding = true;
buildInputs = [ wxGTK30 boost firebird ];
nativeBuildInputs = [ cmake ];
preBuild = ''
sed -i 's/CXXFLAGS = -g -O2/CXXFLAGS = -g -O2 -nostartfiles/' Makefile
'';
configureFlags = [
"--disable-debug"
buildInputs = [
wxGTK32
boost
firebird
];
meta = with lib; {
pkgs/applications/misc/lenmus/default.nix
+33 -10
View File
@@ -1,8 +1,18 @@
{ lib, stdenv, pkg-config, fetchFromGitHub, fetchpatch
, cmake, boost
, portmidi, sqlite
, freetype, libpng, pngpp, zlib
, wxGTK30, wxsqlite3
{ lib
, stdenv
, pkg-config
, fetchFromGitHub
, fetchpatch
, cmake
, boost
, portmidi
, sqlite
, freetype
, libpng
, pngpp
, zlib
, wxGTK30-gtk3
, wxsqlite3
}:
stdenv.mkDerivation rec {
@@ -25,14 +35,28 @@ stdenv.mkDerivation rec {
url = "https://github.com/lenmus/lenmus/commit/6613d20d4051effc782203c9c6d92962a3f66b5f.patch";
sha256 = "01vvzzpamv90jpqbbq1f2m2b4gb9xab9z70am8i41d90nqvg6agn";
})
(fetchpatch {
url = "https://github.com/lenmus/lenmus/commit/37ee8ac9c8faff65a14e8f7ed2bc22e6dc48d91f.patch";
includes = [ "src/app/lenmus_midi_wizard.cpp" ];
sha256 = "sha256-nlT6ZbSCIXUk2Ufv/SDn2A0Rt+s/7m+7l9HOoQmaIhc=";
})
];
nativeBuildInputs = [
cmake
pkg-config
];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [
boost
portmidi sqlite
freetype libpng pngpp zlib
wxGTK30 wxsqlite3
portmidi
sqlite
freetype
libpng
pngpp
zlib
wxGTK30-gtk3
wxsqlite3
];
meta = with lib; {
@@ -46,6 +70,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
maintainers = with maintainers; [ ramkromberg ];
platforms = with platforms; linux;
broken = stdenv.hostPlatform.isAarch64;
};
}
pkgs/applications/misc/lutris/fhsenv.nix
+1 -1
View File
@@ -30,7 +30,7 @@ in buildFHSUserEnv {
# DGen // TODO: libarchive is broken
# Dolphin
bluez ffmpeg gettext portaudio wxGTK30 miniupnpc mbedtls lzo sfml gsm
bluez ffmpeg gettext portaudio wxGTK30-gtk3 miniupnpc mbedtls lzo sfml gsm
wavpack orc nettle gmp pcre vulkan-loader
# DOSBox
pkgs/applications/misc/pwsafe/default.nix
+40 -9
View File
@@ -1,8 +1,25 @@
{ lib, stdenv, fetchFromGitHub
, cmake, pkg-config, zip, gettext, perl
, wxGTK30, libXext, libXi, libXt, libXtst, xercesc
, qrencode, libuuid, libyubikey, yubikey-personalization
, curl, openssl, file, gitUpdater
{ lib
, stdenv
, fetchFromGitHub
, cmake
, pkg-config
, zip
, gettext
, perl
, wxGTK30-gtk3
, libXext
, libXi
, libXt
, libXtst
, xercesc
, qrencode
, libuuid
, libyubikey
, yubikey-personalization
, curl
, openssl
, file
, gitUpdater
}:
stdenv.mkDerivation rec {
@@ -17,12 +34,26 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
cmake gettext perl pkg-config zip
cmake
gettext
perl
pkg-config
zip
];
buildInputs = [
libXext libXi libXt libXtst wxGTK30
curl qrencode libuuid openssl xercesc
libyubikey yubikey-personalization
libXext
libXi
libXt
libXtst
wxGTK30-gtk3
curl
qrencode
libuuid
openssl
xercesc
libyubikey
yubikey-personalization
file
];
pkgs/applications/misc/xchm/default.nix
+17 -5
View File
@@ -1,4 +1,10 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, chmlib }:
{ lib
, stdenv
, fetchFromGitHub
, autoreconfHook
, wxGTK32
, chmlib
}:
stdenv.mkDerivation rec {
pname = "xchm";
@@ -11,13 +17,19 @@ stdenv.mkDerivation rec {
sha256 = "sha256-8HQaXxZQwfBaWc22GivKri1vZEnZ23anSfriCvmLHHw=";
};
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ wxGTK30 chmlib ];
nativeBuildInputs = [
autoreconfHook
];
configureFlags = [ "--with-wx-prefix=${wxGTK30}" ];
buildInputs = [
wxGTK32
chmlib
];
configureFlags = [ "--with-wx-prefix=${wxGTK32}" ];
preConfigure = ''
export LDFLAGS="$LDFLAGS $(${wxGTK30}/bin/wx-config --libs | sed -e s@-pthread@@) -lwx_gtk2u_aui-3.0"
export LDFLAGS="$LDFLAGS $(${wxGTK32}/bin/wx-config --libs | sed -e s@-pthread@@) -lwx_gtk3u_aui-3.2"
'';
meta = with lib; {
pkgs/applications/science/misc/boinc/default.nix
+42 -10
View File
@@ -1,6 +1,28 @@
{ fetchFromGitHub, lib, stdenv, autoconf, automake, pkg-config, m4, curl,
libGLU, libGL, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK30, xcbutil,
sqlite, gtk2, patchelf, libXScrnSaver, libnotify, libX11, libxcb }:
{ fetchFromGitHub
, lib
, stdenv
, autoconf
, automake
, pkg-config
, m4
, curl
, libGLU
, libGL
, libXmu
, libXi
, freeglut
, libjpeg
, libtool
, wxGTK32
, xcbutil
, sqlite
, gtk3
, patchelf
, libXScrnSaver
, libnotify
, libX11
, libxcb
}:
let
majorVersion = "7.20";
@@ -22,8 +44,22 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ libtool automake autoconf m4 pkg-config ];
buildInputs = [
curl libGLU libGL libXmu libXi freeglut libjpeg wxGTK30 sqlite gtk2 libXScrnSaver
libnotify patchelf libX11 libxcb xcbutil
curl
libGLU
libGL
libXmu
libXi
freeglut
libjpeg
wxGTK32
sqlite
gtk3
libXScrnSaver
libnotify
patchelf
libX11
libxcb
xcbutil
];
NIX_LDFLAGS = "-lX11";
@@ -45,11 +81,7 @@ stdenv.mkDerivation rec {
description = "Free software for distributed and grid computing";
homepage = "https://boinc.berkeley.edu/";
license = licenses.lgpl2Plus;
platforms = platforms.linux; # arbitrary choice
# checking for gcc options needed to detect all undeclared functions... cannot detect
# configure: error: in `/build/boinc-7.18.1-src':
# configure: error: cannot make gcc report undeclared builtins
broken = stdenv.isAarch64;
platforms = platforms.linux;
maintainers = with maintainers; [ Luflosi ];
};
}
pkgs/applications/science/misc/fityk/default.nix
+25 -4
View File
@@ -1,5 +1,17 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, boost, lua, zlib, bzip2
, xylib, readline, gnuplot, swig3 }:
{ lib
, stdenv
, fetchFromGitHub
, autoreconfHook
, wxGTK32
, boost
, lua
, zlib
, bzip2
, xylib
, readline
, gnuplot
, swig3
}:
stdenv.mkDerivation rec {
pname = "fityk";
@@ -13,8 +25,17 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ wxGTK30 boost lua zlib bzip2 xylib readline
gnuplot swig3 ];
buildInputs = [
wxGTK32
boost
lua
zlib
bzip2
xylib
readline
gnuplot
swig3
];
NIX_CFLAGS_COMPILE = [
"-std=c++11"
pkgs/development/libraries/xylib/default.nix
+14 -2
View File
@@ -1,4 +1,11 @@
{ lib, stdenv, fetchurl, boost, zlib, bzip2, wxGTK30 }:
{ lib
, stdenv
, fetchurl
, boost
, zlib
, bzip2
, wxGTK32
}:
stdenv.mkDerivation rec {
pname = "xylib";
@@ -9,7 +16,12 @@ stdenv.mkDerivation rec {
sha256 = "1iqfrfrk78mki5csxysw86zm35ag71w0jvim0f12nwq1z8rwnhdn";
};
buildInputs = [ boost zlib bzip2 wxGTK30 ];
buildInputs = [
boost
zlib
bzip2
wxGTK32
];
meta = with lib; {
description = "Portable library for reading files that contain x-y data from powder diffraction, spectroscopy and other experimental methods";
pkgs/games/odamex/default.nix
+37 -5
View File
@@ -1,4 +1,14 @@
{ lib, stdenv, cmake, fetchurl, pkg-config, SDL, SDL_mixer, SDL_net, wxGTK30 }:
{ lib
, stdenv
, fetchurl
, cmake
, pkg-config
, makeWrapper
, SDL
, SDL_mixer
, SDL_net
, wxGTK32
}:
stdenv.mkDerivation rec {
pname = "odamex";
@@ -9,14 +19,36 @@ stdenv.mkDerivation rec {
sha256 = "sha256-WBqO5fWzemw1kYlY192v0nnZkbIEVuWmjWYMy+1ODPQ=";
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ SDL SDL_mixer SDL_net wxGTK30 ];
nativeBuildInputs = [
cmake
pkg-config
makeWrapper
];
buildInputs = [
SDL
SDL_mixer
SDL_net
wxGTK32
];
installPhase = ''
runHook preInstall
'' + (if stdenv.isDarwin then ''
mkdir -p $out/{Applications,bin}
mv odalaunch/odalaunch.app $out/Applications
makeWrapper $out/{Applications/odalaunch.app/Contents/MacOS,bin}/odalaunch
'' else ''
make install
'') + ''
runHook postInstall
'';
meta = {
homepage = "http://odamex.net/";
description = "A client/server port for playing old-school Doom online";
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
license = lib.licenses.gpl2Only;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ MP2E ];
};
}
pkgs/games/spring/default.nix
+58 -14
View File
@@ -1,7 +1,31 @@
{ lib, stdenv, fetchFromGitHub, cmake, xz, boost, libdevil, zlib, p7zip
, openal, libvorbis, glew, freetype, xorg, SDL2, libGLU, libGL
, asciidoc, docbook_xsl, docbook_xsl_ns, curl, makeWrapper
, jdk ? null, python ? null, systemd, libunwind, which, minizip
{ lib
, stdenv
, fetchFromGitHub
, cmake
, xz
, boost
, libdevil
, zlib
, p7zip
, openal
, libvorbis
, glew
, freetype
, xorg
, SDL2
, libGLU
, libGL
, asciidoc
, docbook_xsl
, docbook_xsl_ns
, curl
, makeWrapper
, jdk
, python
, systemd
, libunwind
, which
, minizip
, withAI ? true # support for AI Interfaces and Skirmish AIs
}:
@@ -36,16 +60,36 @@ stdenv.mkDerivation rec {
echo "${version} maintenance" > VERSION
'';
cmakeFlags = ["-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON"
"-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON"
"-DPREFER_STATIC_LIBS:BOOL=OFF"];
cmakeFlags = [
"-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON"
"-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON"
"-DPREFER_STATIC_LIBS:BOOL=OFF"
];
nativeBuildInputs = [ cmake makeWrapper docbook_xsl docbook_xsl_ns asciidoc ];
buildInputs = [ xz boost libdevil zlib p7zip openal libvorbis freetype SDL2
xorg.libX11 xorg.libXcursor libGLU libGL glew curl
systemd libunwind which minizip ]
++ lib.optional withAI jdk
++ lib.optional withAI python;
buildInputs = [
xz
boost
libdevil
zlib
p7zip
openal
libvorbis
freetype
SDL2
xorg.libX11
xorg.libXcursor
libGLU
libGL
glew
curl
systemd
libunwind
which
minizip
]
++ lib.optional withAI jdk
++ lib.optional withAI python;
NIX_CFLAGS_COMPILE = "-fpermissive"; # GL header minor incompatibility
@@ -57,8 +101,8 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://springrts.com/";
description = "A powerful real-time strategy (RTS) game engine";
license = licenses.gpl2;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ qknight domenkozar sorki ];
platforms = platforms.linux;
platforms = [ "i686-linux" "x86_64-linux" ];
};
}
pkgs/games/spring/springlobby.nix
+42 -8
View File
@@ -1,6 +1,28 @@
{ lib, stdenv, fetchurl, fetchpatch, cmake, wxGTK30, openal, pkg-config, curl, libtorrent-rasterbar
, libpng, libX11, gettext, boost, libnotify, gtk2, doxygen, spring
, makeWrapper, glib, minizip, alure, pcre, jsoncpp }:
{ lib
, stdenv
, fetchurl
, fetchpatch
, cmake
, wxGTK30
, openal
, pkg-config
, curl
, libtorrent-rasterbar
, libpng
, libX11
, gettext
, boost
, libnotify
, gtk2
, doxygen
, spring
, makeWrapper
, glib
, minizip
, alure
, pcre
, jsoncpp
}:
stdenv.mkDerivation rec {
pname = "springlobby";
@@ -13,8 +35,20 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config gettext doxygen makeWrapper ];
buildInputs = [
wxGTK30 openal curl libtorrent-rasterbar pcre jsoncpp
boost libpng libX11 libnotify gtk2 glib minizip alure
wxGTK30
openal
curl
libtorrent-rasterbar
pcre
jsoncpp
boost
libpng
libX11
libnotify
gtk2
glib
minizip
alure
];
patches = [
@@ -33,10 +67,10 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
homepage = "https://springlobby.info/";
homepage = "https://springlobby.springrts.com";
description = "Cross-platform lobby client for the Spring RTS project";
license = licenses.gpl2;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ qknight domenkozar ];
platforms = platforms.linux;
platforms = [ "i686-linux" "x86_64-linux" ];
};
}
pkgs/misc/screensavers/electricsheep/default.nix
+34 -5
View File
@@ -1,6 +1,23 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, ffmpeg, lua5_1, curl
, libpng, xorg, pkg-config, flam3, libgtop, boost, tinyxml, freeglut, libGLU, libGL
, glee }:
{ lib
, stdenv
, fetchFromGitHub
, autoreconfHook
, wxGTK32
, ffmpeg
, lua5_1
, curl
, libpng
, xorg
, pkg-config
, flam3
, libgtop
, boost
, tinyxml
, freeglut
, libGLU
, libGL
, glee
}:
stdenv.mkDerivation rec {
pname = "electricsheep";
@@ -16,8 +33,20 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [
wxGTK30 ffmpeg lua5_1 curl libpng xorg.libXrender
flam3 libgtop boost tinyxml freeglut libGLU libGL glee
wxGTK32
ffmpeg
lua5_1
curl
libpng
xorg.libXrender
flam3
libgtop
boost
tinyxml
freeglut
libGLU
libGL
glee
];
preAutoreconf = ''