diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-11-06 14:33:18 +0100 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-11-06 14:33:18 +0100 |
| commit | 32da89a1a1dfb314f614213cdd0f574baf873156 (patch) | |
| tree | 312e552d4df4f142cf08fba1c5f3d45f61e82575 /pkgs/games | |
| parent | 2ee2d62dce74178c62736fe4a8c784ef40476465 (diff) | |
| parent | 250c07f960eaefd781df539ee0d877b13da17b97 (diff) | |
| download | nixpkgs-32da89a1a1dfb314f614213cdd0f574baf873156.tar nixpkgs-32da89a1a1dfb314f614213cdd0f574baf873156.tar.gz nixpkgs-32da89a1a1dfb314f614213cdd0f574baf873156.tar.bz2 nixpkgs-32da89a1a1dfb314f614213cdd0f574baf873156.tar.lz nixpkgs-32da89a1a1dfb314f614213cdd0f574baf873156.tar.xz nixpkgs-32da89a1a1dfb314f614213cdd0f574baf873156.tar.zst nixpkgs-32da89a1a1dfb314f614213cdd0f574baf873156.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/lunar-client/default.nix | 40 | ||||
| -rw-r--r-- | pkgs/games/osu-lazer/default.nix | 3 |
2 files changed, 1 insertions, 42 deletions
diff --git a/pkgs/games/lunar-client/default.nix b/pkgs/games/lunar-client/default.nix deleted file mode 100644 index 042259fcfae..00000000000 --- a/pkgs/games/lunar-client/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ appimageTools -, fetchurl -, lib -, makeWrapper -}: - -let - pname = "lunar-client"; - version = "3.1.0"; - - src = fetchurl { - url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage"; - hash = "sha256-6OAGNkMyHOZI5wh92OtalnvUVFWNAS9PvkFS0e4YXhk="; - }; - - appimageContents = appimageTools.extract { inherit pname version src; }; -in -appimageTools.wrapType2 rec { - inherit pname version src; - - extraInstallCommands = '' - mv $out/bin/{${pname}-${version},${pname}} - source "${makeWrapper}/nix-support/setup-hook" - wrapProgram $out/bin/${pname} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" - install -Dm444 ${appimageContents}/launcher.desktop $out/share/applications/lunar-client.desktop - install -Dm444 ${appimageContents}/launcher.png $out/share/pixmaps/lunar-client.png - substituteInPlace $out/share/applications/lunar-client.desktop \ - --replace 'Exec=AppRun --no-sandbox %U' 'Exec=lunar-client' \ - --replace 'Icon=launcher' 'Icon=lunar-client' - ''; - - meta = with lib; { - description = "Free Minecraft client with mods, cosmetics, and performance boost."; - homepage = "https://www.lunarclient.com/"; - license = with licenses; [ unfree ]; - maintainers = with maintainers; [ zyansheep Technical27 surfaceflinger ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index 4286edf6f09..8597616b434 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -9,7 +9,6 @@ , SDL2 , lttng-ust , numactl -, dotnetCorePackages , libglvnd , xorg , udev @@ -84,7 +83,7 @@ buildDotnetModule rec { cc-by-nc-40 unfreeRedistributable # osu-framework contains libbass.so in repository ]; - maintainers = with maintainers; [ oxalica thiagokokada ]; + maintainers = with maintainers; [ thiagokokada ]; platforms = [ "x86_64-linux" ]; mainProgram = "osu!"; }; |