cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #247725 from lasers/citra

Browse source 
citra: nightly 1907 -> 1963, canary 2484 -> 2573
This commit is contained in:
Nick Cao 2023-08-09 02:34:52 -06:00 committed by GitHub
commit e42cdd6768
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/applications/emulators/citra/default.nix
View file

@ -9,19 +9,19 @@ let
# Please make sure to update this when updating citra! # Please make sure to update this when updating citra!
compat-list = fetchurl { compat-list = fetchurl {
name = "citra-compat-list"; name = "citra-compat-list";
url = "https://web.archive.org/web/20230512234055/https://api.citra-emu.org/gamedb/"; url = "https://web.archive.org/web/20230807103651/https://api.citra-emu.org/gamedb/";
hash = "sha256-J+zqtWde5NgK2QROvGewtXGRAWUTNSKHNMG6iu9m1fU="; hash = "sha256-Ma1SXgzhyMHa/MeoYuf8b+QYPjhoQEeKklLbGbkHwEk=";
}; };
in { in {
nightly = qt6Packages.callPackage ./generic.nix rec { nightly = qt6Packages.callPackage ./generic.nix rec {
pname = "citra-nightly"; pname = "citra-nightly";
version = "1907"; version = "1963";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "citra-emu"; owner = "citra-emu";
repo = "citra-nightly"; repo = "citra-nightly";
rev = "nightly-${version}"; rev = "nightly-${version}";
sha256 = "l4pqok42/ybnRX90Qwhcgm2JR4/9C5bbCTk3j4QuWtw="; sha256 = "0ggi1l8327s43xaxs616g0s9vmal6q7vsv69bn07gp71gchhcmyi";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -30,13 +30,13 @@ in {
canary = qt6Packages.callPackage ./generic.nix rec { canary = qt6Packages.callPackage ./generic.nix rec {
pname = "citra-canary"; pname = "citra-canary";
version = "2484"; version = "2573";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "citra-emu"; owner = "citra-emu";
repo = "citra-canary"; repo = "citra-canary";
rev = "canary-${version}"; rev = "canary-${version}";
sha256 = "IgCpqt3rKV9IqNstF4QwnJlE3hPH+BkIhaOvEmshh0U="; sha256 = "sha256-tQJ3WcqGcnW9dOiwDrBgL0n3UNp1DGQ/FjCR28Xjdpc=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

14
pkgs/applications/emulators/citra/generic.nix
View file

@ -8,9 +8,10 @@
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, cmake , cmake
, boost179 , boost
, pkg-config , pkg-config
, libusb1 , libusb1
, glslang
, zstd , zstd
, libressl , libressl
, enableSdl2 ? true, SDL2 , enableSdl2 ? true, SDL2
@ -31,11 +32,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
glslang
pkg-config pkg-config
] ++ lib.optionals enableQt [ wrapQtAppsHook ]; ] ++ lib.optionals enableQt [ wrapQtAppsHook ];
buildInputs = [ buildInputs = [
boost179 boost
libusb1 libusb1
] ++ lib.optionals enableQt [ qtbase qtmultimedia ] ] ++ lib.optionals enableQt [ qtbase qtmultimedia ]
++ lib.optional enableSdl2 SDL2 ++ lib.optional enableSdl2 SDL2
@ -47,6 +49,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-DUSE_SYSTEM_BOOST=ON" "-DUSE_SYSTEM_BOOST=ON"
"-DCITRA_WARNINGS_AS_ERRORS=OFF"
"-DCITRA_USE_BUNDLED_FFMPEG=OFF" "-DCITRA_USE_BUNDLED_FFMPEG=OFF"
"-DCITRA_USE_BUNDLED_QT=OFF" "-DCITRA_USE_BUNDLED_QT=OFF"
"-DUSE_SYSTEM_SDL2=ON" "-DUSE_SYSTEM_SDL2=ON"
@ -66,7 +69,9 @@ stdenv.mkDerivation rec {
++ lib.optional useDiscordRichPresence "-DUSE_DISCORD_PRESENCE=ON" ++ lib.optional useDiscordRichPresence "-DUSE_DISCORD_PRESENCE=ON"
++ lib.optional enableFdk "-DENABLE_FDK=ON"; ++ lib.optional enableFdk "-DENABLE_FDK=ON";
postPatch = '' postPatch = with lib; let
branchCaptialized = (lib.toUpper (lib.substring 0 1 branch) + lib.substring 1 (-1) branch);
in ''
# Fix file not found when looking in var/empty instead of opt # Fix file not found when looking in var/empty instead of opt
mkdir externals/dynarmic/src/dynarmic/ir/var mkdir externals/dynarmic/src/dynarmic/ir/var
ln -s ../opt externals/dynarmic/src/dynarmic/ir/var/empty ln -s ../opt externals/dynarmic/src/dynarmic/ir/var/empty
@ -78,6 +83,9 @@ stdenv.mkDerivation rec {
substituteInPlace CMakeLists.txt \ substituteInPlace CMakeLists.txt \
--replace "check_submodules_present()" "" --replace "check_submodules_present()" ""
# Add versions
echo 'set(BUILD_FULLNAME "${branchCaptialized} ${version}")' >> CMakeModules/GenerateBuildInfo.cmake
# Devendoring # Devendoring
rm -rf externals/zstd externals/libressl rm -rf externals/zstd externals/libressl
cp -r ${zstd.src} externals/zstd cp -r ${zstd.src} externals/zstd

8
pkgs/applications/emulators/citra/update.sh
View file

@ -44,8 +44,8 @@ updateNightly() {
echo " Successfully fetched. hash: ${NEW_NIGHTLY_HASH}" echo " Successfully fetched. hash: ${NEW_NIGHTLY_HASH}"
sed -i "s/${OLD_NIGHTLY_VERSION}/${NEW_NIGHTLY_VERSION}/" ./default.nix sed -i "s|${OLD_NIGHTLY_VERSION}|${NEW_NIGHTLY_VERSION}|" ./default.nix
sed -i "s/${OLD_NIGHTLY_HASH}/${NEW_NIGHTLY_HASH}/" ./default.nix sed -i "s|${OLD_NIGHTLY_HASH}|${NEW_NIGHTLY_HASH}|" ./default.nix
} }
updateCanary() { updateCanary() {
@ -69,8 +69,8 @@ updateCanary() {
echo " Successfully fetched. hash: ${NEW_CANARY_HASH}" echo " Successfully fetched. hash: ${NEW_CANARY_HASH}"
sed -i "s/${OLD_CANARY_VERSION}/${NEW_CANARY_VERSION}/" ./default.nix sed -i "s|${OLD_CANARY_VERSION}|${NEW_CANARY_VERSION}|" ./default.nix
sed -i "s/${OLD_CANARY_HASH}/${NEW_CANARY_HASH}/" ./default.nix sed -i "s|${OLD_CANARY_HASH}|${NEW_CANARY_HASH}|" ./default.nix
} }
if [[ "$BRANCH" = "nightly" ]]; then if [[ "$BRANCH" = "nightly" ]]; then