osu-lazer: Rebase patches

This also modifies how the patches are applied, since nixpkgs does not
apply any patches any more.
This commit is contained in:
Simon Bruder 2021-08-07 13:22:16 +02:00
parent 552c4d3b2b
commit cb3401ff87
Signed by: simon
GPG key ID: 8D3C82F9F309F8EC
3 changed files with 13 additions and 10 deletions

View file

@ -1,4 +1,4 @@
From 0dbe256bc02cfa70a3a6df13e9446aa032e751c3 Mon Sep 17 00:00:00 2001
From 222a609074c2394b1d335271c9d705e07084fd33 Mon Sep 17 00:00:00 2001
From: Simon Bruder <simon@sbruder.de>
Date: Fri, 9 Apr 2021 12:01:42 +0200
Subject: [PATCH 1/2] Disable deployed build
@ -9,10 +9,10 @@ It shows warnings at startup which prolong the time it takes to start.
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 406819cbd2..d1261ad6fc 100644
index f2d575550a..e2f81d068c 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -128,15 +128,12 @@ public class OsuGameBase : Framework.Game, ICanAcceptFiles
@@ -71,15 +71,12 @@ public partial class OsuGameBase : Framework.Game, ICanAcceptFiles
/// </summary>
public string VersionHash { get; private set; }
@ -27,8 +27,8 @@ index 406819cbd2..d1261ad6fc 100644
- return @"local " + (DebugUtils.IsDebugBuild ? @"debug" : @"release");
-
var version = AssemblyVersion;
return $@"{version.Major}.{version.Minor}.{version.Build}";
return $@"{version.Major}.{version.Minor}.{version.Build}-lazer";
}
--
2.29.3
2.31.1

View file

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

View file

@ -1,6 +1,9 @@
{ osu-lazer }:
osu-lazer.overrideAttrs (o: o // {
patches = o.patches ++ [
# DOS line endings
patchFlags = [ "--binary" "-p1" ];
patches = [
./0001-Disable-deployed-build.patch
./0002-Remove-random-song-button-from-footer.patch
];