simon/nixos-config
simon/nixos-config
1
1
Fork 0
Code Issues 8 Pull requests Actions Projects Activity

pkgs/osu-lazer: Rebase patches

Browse source
This commit is contained in:
Simon Bruder 2022-07-23 20:38:38 +02:00
parent 3e5881fe7a
commit b9f2230d5f
Signed by: simon
GPG key ID: 8D3C82F9F309F8EC
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/osu-lazer/0001-Disable-deployed-build.patch
View file

@ -1,4 +1,4 @@
From 222a609074c2394b1d335271c9d705e07084fd33 Mon Sep 17 00:00:00 2001 From ba1b9a0549968992b34093f587fde5570dd4dfe2 Mon Sep 17 00:00:00 2001
From: Simon Bruder <simon@sbruder.de> From: Simon Bruder <simon@sbruder.de>
Date: Fri, 9 Apr 2021 12:01:42 +0200 Date: Fri, 9 Apr 2021 12:01:42 +0200
Subject: [PATCH 1/2] Disable deployed build Subject: [PATCH 1/2] Disable deployed build
@ -9,17 +9,19 @@ It shows warnings at startup which prolong the time it takes to start.
1 file changed, 1 insertion(+), 4 deletions(-) 1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index f2d575550a..e2f81d068c 100644 index 3b81b5c8cd..856b7a0039 100644
--- a/osu.Game/OsuGameBase.cs --- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs +++ b/osu.Game/OsuGameBase.cs
@@ -71,15 +71,12 @@ public partial class OsuGameBase : Framework.Game, ICanAcceptFiles @@ -98,7 +98,7 @@ public partial class OsuGameBase : Framework.Game, ICanAcceptFiles, IBeatSyncPro
/// </summary> /// </summary>
public string VersionHash { get; private set; } public string VersionHash { get; private set; }
- public bool IsDeployedBuild => AssemblyVersion.Major > 0; - public bool IsDeployedBuild => AssemblyVersion.Major > 0;
+ public bool IsDeployedBuild => false; + public bool IsDeployedBuild => false;
public virtual string Version internal const string BUILD_SUFFIX = "lazer";
@@ -106,9 +106,6 @@ public virtual string Version
{ {
get get
{ {
@ -27,8 +29,8 @@ index f2d575550a..e2f81d068c 100644
- return @"local " + (DebugUtils.IsDebugBuild ? @"debug" : @"release"); - return @"local " + (DebugUtils.IsDebugBuild ? @"debug" : @"release");
- -
var version = AssemblyVersion; var version = AssemblyVersion;
return $@"{version.Major}.{version.Minor}.{version.Build}-lazer"; return $@"{version.Major}.{version.Minor}.{version.Build}-{BUILD_SUFFIX}";
} }
-- --
2.31.1 2.36.0

8
pkgs/osu-lazer/0002-Remove-random-song-button-from-footer.patch
View file

@ -1,4 +1,4 @@
From 9ebcc0ec1bd0bd6bb54f2516290a12bf8ed4def7 Mon Sep 17 00:00:00 2001 From 9e2055a56686cfb0231915289bf977a590d5b10d Mon Sep 17 00:00:00 2001
From: Simon Bruder <simon@sbruder.de> From: Simon Bruder <simon@sbruder.de>
Date: Fri, 9 Apr 2021 12:02:44 +0200 Date: Fri, 9 Apr 2021 12:02:44 +0200
Subject: [PATCH 2/2] Remove random song button from footer Subject: [PATCH 2/2] Remove random song button from footer
@ -9,10 +9,10 @@ I often click it accidentally.
1 file changed, 5 deletions(-) 1 file changed, 5 deletions(-)
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 270addc8e6..78a03a37a2 100644 index 7abcbfca42..7bbfac6a85 100644
--- a/osu.Game/Screens/Select/SongSelect.cs --- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs +++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -305,11 +305,6 @@ private void load(AudioManager audio, DialogOverlay dialog, OsuColour colours, M @@ -305,11 +305,6 @@ protected override void LoadComplete()
protected virtual IEnumerable<(FooterButton, OverlayContainer)> CreateFooterButtons() => new (FooterButton, OverlayContainer)[] protected virtual IEnumerable<(FooterButton, OverlayContainer)> CreateFooterButtons() => new (FooterButton, OverlayContainer)[]
{ {
(new FooterButtonMods { Current = Mods }, ModSelect), (new FooterButtonMods { Current = Mods }, ModSelect),
@ -25,5 +25,5 @@ index 270addc8e6..78a03a37a2 100644
}; };
-- --
2.31.1 2.36.0