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

Merge pull request #111793 from oxalica/osu

Browse Source 
osu-lazer: 2020.1225.0 -> 2021.129.0
This commit is contained in:
Sandro 2021-02-04 23:45:09 +01:00 committed by GitHub
commit 9847d1368d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 401 additions and 592 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/games/osu-lazer/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, makeDesktopItem, linkFarmFromDrvs { lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, makeDesktopItem, linkFarmFromDrvs
, dotnet-sdk, dotnet-netcore, dotnetPackages , dotnetCorePackages, dotnetPackages, cacert
, ffmpeg_4, alsaLib, SDL2, lttng-ust, numactl, alsaPlugins , ffmpeg_4, alsaLib, SDL2, lttng-ust, numactl, alsaPlugins
}: }:
@ -8,24 +8,31 @@ let
ffmpeg_4 alsaLib SDL2 lttng-ust numactl ffmpeg_4 alsaLib SDL2 lttng-ust numactl
]; ];
dotnet-sdk = dotnetCorePackages.sdk_5_0;
dotnet-net = dotnetCorePackages.net_5_0;
# https://docs.microsoft.com/en-us/dotnet/core/rid-catalog#using-rids # https://docs.microsoft.com/en-us/dotnet/core/rid-catalog#using-rids
runtimeId = "linux-x64"; runtimeId = "linux-x64";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "osu-lazer"; pname = "osu-lazer";
version = "2020.1225.0"; version = "2021.129.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ppy"; owner = "ppy";
repo = "osu"; repo = "osu";
rev = version; rev = version;
sha256 = "BISczC4xYcF6m5l3ye/bdZxs/aK0Jz6sFVFOgNDo0v0="; sha256 = "AVx842Zq3mq59VCPdF94mcx5uOr70SmkV/tMNkNyMSY=";
}; };
patches = [ ./bypass-tamper-detection.patch ]; patches = [ ./bypass-tamper-detection.patch ];
patchFlags = [ "--binary" "-p1" ]; patchFlags = [ "--binary" "-p1" ];
nativeBuildInputs = [ dotnet-sdk dotnetPackages.Nuget makeWrapper ]; nativeBuildInputs = [
dotnet-sdk dotnetPackages.Nuget makeWrapper
# FIXME: Without `cacert`, we will suffer from https://github.com/NuGet/Announcements/issues/49
cacert
];
nugetDeps = linkFarmFromDrvs "${pname}-nuget-deps" (import ./deps.nix { nugetDeps = linkFarmFromDrvs "${pname}-nuget-deps" (import ./deps.nix {
fetchNuGet = { name, version, sha256 }: fetchurl { fetchNuGet = { name, version, sha256 }: fetchurl {
@ -75,7 +82,7 @@ in stdenv.mkDerivation rec {
--output $out/lib/osu --output $out/lib/osu
makeWrapper $out/lib/osu/osu\! $out/bin/osu\! \ makeWrapper $out/lib/osu/osu\! $out/bin/osu\! \
--set DOTNET_ROOT "${dotnet-netcore}" \ --set DOTNET_ROOT "${dotnet-net}" \
--suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}" --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}"
for i in 16 32 48 64 96 128 256 512 1024; do for i in 16 32 48 64 96 128 256 512 1024; do
install -D ./assets/lazer.png $out/share/icons/hicolor/''${i}x$i/apps/osu\!.png install -D ./assets/lazer.png $out/share/icons/hicolor/''${i}x$i/apps/osu\!.png

965
pkgs/games/osu-lazer/deps.nix generated
View File

File diff suppressed because it is too large Load Diff

4
pkgs/games/osu-lazer/osu.runtimeconfig.json
View File

@ -1,9 +1,9 @@
{ {
"runtimeOptions": { "runtimeOptions": {
"tfm": "netcoreapp3.1", "tfm": "net5.0",
"framework": { "framework": {
"name": "Microsoft.NETCore.App", "name": "Microsoft.NETCore.App",
"version": "3.1.0" "version": "5.0.0"
} }
} }
} }

2
pkgs/games/osu-lazer/update.sh
View File

@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell #!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts dotnet-sdk_3 #!nix-shell -i bash -p curl jq common-updater-scripts dotnet-sdk_5
set -eo pipefail set -eo pipefail
cd "$(dirname "${BASH_SOURCE[0]}")" cd "$(dirname "${BASH_SOURCE[0]}")"

5
pkgs/top-level/all-packages.nix
View File

@ -24094,10 +24094,7 @@ in
osmium-tool = callPackage ../applications/misc/osmium-tool { }; osmium-tool = callPackage ../applications/misc/osmium-tool { };
osu-lazer = callPackage ../games/osu-lazer { osu-lazer = callPackage ../games/osu-lazer { };
dotnet-sdk = dotnetCorePackages.sdk_3_1;
dotnet-netcore = dotnetCorePackages.netcore_3_1;
};
owamp = callPackage ../applications/networking/owamp { }; owamp = callPackage ../applications/networking/owamp { };