mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-14 15:36:47 +03:00
Merge pull request #198590 from zhaofengli/cemu-wiiu
cemu: init at 2.0-10
This commit is contained in:
commit
21fdd3855b
@ -1481,6 +1481,12 @@
|
||||
githubId = 35324;
|
||||
name = "Badi' Abdul-Wahid";
|
||||
};
|
||||
baduhai = {
|
||||
email = "baduhai@pm.me";
|
||||
github = "baduhai";
|
||||
githubId = 31864305;
|
||||
name = "William";
|
||||
};
|
||||
baitinq = {
|
||||
email = "manuelpalenzuelamerino@gmail.com";
|
||||
name = "Baitinq";
|
||||
|
@ -721,6 +721,16 @@
|
||||
instead.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The
|
||||
<link xlink:href="https://ce-programming.github.io/CEmu">CEmu
|
||||
TI-84 Plus CE emulator</link> package has been renamed to
|
||||
<literal>cemu-ti</literal>. The
|
||||
<link xlink:href="https://cemu.info">Cemu Wii U
|
||||
emulator</link> is now packaged as <literal>cemu</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>systemd-networkd</literal> v250 deprecated, renamed,
|
||||
|
@ -235,6 +235,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
|
||||
|
||||
- The `aws` package has been removed due to being abandoned by the upstream. It is recommended to use `awscli` or `awscli2` instead.
|
||||
|
||||
- The [CEmu TI-84 Plus CE emulator](https://ce-programming.github.io/CEmu) package has been renamed to `cemu-ti`. The [Cemu Wii U emulator](https://cemu.info) is now packaged as `cemu`.
|
||||
|
||||
- `systemd-networkd` v250 deprecated, renamed, and moved some sections and settings which leads to the following breaking module changes:
|
||||
|
||||
* `systemd.network.networks.<name>.dhcpV6PrefixDelegationConfig` is renamed to `systemd.network.networks.<name>.dhcpPrefixDelegationConfig`.
|
||||
|
12
pkgs/applications/emulators/cemu/cmakelists.patch
Normal file
12
pkgs/applications/emulators/cemu/cmakelists.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 4b2b789..48d9be0 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -92,6 +92,7 @@ find_package(pugixml REQUIRED)
|
||||
find_package(RapidJSON REQUIRED)
|
||||
find_package(Boost COMPONENTS program_options filesystem nowide REQUIRED)
|
||||
find_package(libzip REQUIRED)
|
||||
+find_package(SPIRV-Tools-opt REQUIRED)
|
||||
find_package(glslang REQUIRED)
|
||||
find_package(ZLIB REQUIRED)
|
||||
find_package(zstd MODULE REQUIRED) # MODULE so that zstd::zstd is available
|
119
pkgs/applications/emulators/cemu/default.nix
Normal file
119
pkgs/applications/emulators/cemu/default.nix
Normal file
@ -0,0 +1,119 @@
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, addOpenGLRunpath
|
||||
, wrapGAppsHook
|
||||
, cmake
|
||||
, glslang
|
||||
, nasm
|
||||
, pkg-config
|
||||
|
||||
, SDL2
|
||||
, boost
|
||||
, cubeb
|
||||
, curl
|
||||
, fmt_9
|
||||
, glm
|
||||
, gtk3
|
||||
, imgui
|
||||
, libpng
|
||||
, libzip
|
||||
, libXrender
|
||||
, pugixml
|
||||
, rapidjson
|
||||
, vulkan-headers
|
||||
, wxGTK32
|
||||
, zarchive
|
||||
|
||||
, vulkan-loader
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cemu";
|
||||
version = "2.0-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cemu-project";
|
||||
repo = "Cemu";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-GJA/lJJqShuHeYirBW1kyVsU44kMpmAn916PSGOnKkY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# glslangTargets want SPIRV-Tools-opt to be defined:
|
||||
# > The following imported targets are referenced, but are missing:
|
||||
# > SPIRV-Tools-opt
|
||||
./cmakelists.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
addOpenGLRunpath
|
||||
wrapGAppsHook
|
||||
cmake
|
||||
glslang
|
||||
nasm
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
SDL2
|
||||
boost
|
||||
cubeb
|
||||
curl
|
||||
fmt_9
|
||||
glm
|
||||
gtk3
|
||||
imgui
|
||||
libpng
|
||||
libzip
|
||||
libXrender
|
||||
pugixml
|
||||
rapidjson
|
||||
vulkan-headers
|
||||
wxGTK32
|
||||
zarchive
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_C_FLAGS_RELEASE=-DNDEBUG"
|
||||
"-DCMAKE_CXX_FLAGS_RELEASE=-DNDEBUG"
|
||||
"-DENABLE_VCPKG=OFF"
|
||||
|
||||
# PORTABLE:
|
||||
# "All data created and maintained by Cemu will be in the directory where the executable file is located"
|
||||
"-DPORTABLE=OFF"
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
rm -rf dependencies/imgui
|
||||
ln -s ${imgui}/include/imgui dependencies/imgui
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 ../bin/Cemu_release $out/bin/Cemu
|
||||
ln -s $out/bin/Cemu $out/bin/cemu
|
||||
|
||||
mkdir -p $out/share/applications
|
||||
substitute ../dist/linux/info.cemu.Cemu.desktop $out/share/applications/info.cemu.Cemu.desktop \
|
||||
--replace "Exec=Cemu" "Exec=$out/bin/Cemu"
|
||||
|
||||
install -Dm644 ../dist/linux/info.cemu.Cemu.metainfo.xml -t $out/share/metainfo
|
||||
install -Dm644 ../src/resource/logo_icon.png $out/share/icons/hicolor/128x128/apps/info.cemu.Cemu.png
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
preFixup = let
|
||||
libs = [ vulkan-loader ] ++ cubeb.passthru.backendLibs;
|
||||
in ''
|
||||
gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath libs}")
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cemu is a Wii U emulator";
|
||||
homepage = "https://cemu.info";
|
||||
license = licenses.mpl20;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ zhaofengli baduhai ];
|
||||
};
|
||||
}
|
56
pkgs/development/libraries/audio/cubeb/default.nix
Normal file
56
pkgs/development/libraries/audio/cubeb/default.nix
Normal file
@ -0,0 +1,56 @@
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, jack2
|
||||
, pulseaudio
|
||||
, sndio
|
||||
, speexdsp
|
||||
, lazyLoad ? true
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "cubeb";
|
||||
version = "unstable-2022-10-18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mozilla";
|
||||
repo = "cubeb";
|
||||
rev = "27d2a102b0b75d9e49d43bc1ea516233fb87d778";
|
||||
hash = "sha256-q+uz1dGU4LdlPogL1nwCR/KuOX4Oy3HhMdA6aJylBRk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
jack2
|
||||
pulseaudio
|
||||
sndio
|
||||
speexdsp
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_SHARED_LIBS=ON"
|
||||
"-DBUILD_TESTS=OFF" # tests require an audio server
|
||||
"-DBUNDLE_SPEEX=OFF"
|
||||
"-DUSE_SANITIZERS=OFF"
|
||||
|
||||
# Whether to lazily load libraries with dlopen()
|
||||
"-DLAZY_LOAD_LIBS=${if lazyLoad then "ON" else "OFF"}"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
# For downstream users when lazyLoad is true
|
||||
backendLibs = [ jack2 pulseaudio sndio speexdsp ];
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cross platform audio library";
|
||||
homepage = "https://github.com/mozilla/cubeb";
|
||||
license = licenses.isc;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ zhaofengli ];
|
||||
};
|
||||
}
|
@ -53,7 +53,7 @@ in
|
||||
};
|
||||
|
||||
fmt_9 = generic {
|
||||
version = "9.0.0";
|
||||
sha256 = "sha256-nwlAzMkY1JdhLtes48VaNH9LS7GzqtPCwk2dZA/bGmQ=";
|
||||
version = "9.1.0";
|
||||
sha256 = "sha256-rP6ymyRc7LnKxUXwPpzhHOQvpJkpnRFOt2ctvUNlYI0=";
|
||||
};
|
||||
}
|
||||
|
23
pkgs/tools/archivers/zarchive/default.nix
Normal file
23
pkgs/tools/archivers/zarchive/default.nix
Normal file
@ -0,0 +1,23 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, zstd }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zarchive";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Exzap";
|
||||
repo = "ZArchive";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hX637O/mVLTzmG0a9swJu9w+3o26VHo+K/9RhMuf1lI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ zstd ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "File archive format supporting random-access reads";
|
||||
homepage = "https://github.com/Exzap/ZArchive";
|
||||
license = licenses.mit0;
|
||||
maintainers = with maintainers; [ zhaofengli ];
|
||||
};
|
||||
}
|
@ -1503,6 +1503,8 @@ with pkgs;
|
||||
|
||||
cdemu-daemon = callPackage ../applications/emulators/cdemu/daemon.nix { };
|
||||
|
||||
cemu = callPackage ../applications/emulators/cemu { };
|
||||
|
||||
cen64 = callPackage ../applications/emulators/cen64 { };
|
||||
|
||||
citra-canary = callPackage ../applications/emulators/citra {
|
||||
@ -13064,6 +13066,8 @@ with pkgs;
|
||||
|
||||
yj = callPackage ../development/tools/yj { };
|
||||
|
||||
zarchive = callPackage ../tools/archivers/zarchive { };
|
||||
|
||||
zprint = callPackage ../development/tools/zprint { };
|
||||
|
||||
yle-dl = callPackage ../tools/misc/yle-dl {};
|
||||
@ -18198,6 +18202,8 @@ with pkgs;
|
||||
# justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990
|
||||
cachix = haskell.lib.compose.justStaticExecutables haskellPackages.cachix;
|
||||
|
||||
cubeb = callPackage ../development/libraries/audio/cubeb { };
|
||||
|
||||
hercules-ci-agent = callPackage ../development/tools/continuous-integration/hercules-ci-agent { };
|
||||
|
||||
hci = callPackage ../development/tools/continuous-integration/hci { };
|
||||
|
Loading…
Reference in New Issue
Block a user