diff --git a/exprs/lunar-client.nix b/exprs/lunar-client.nix new file mode 100644 index 0000000..7a9ab91 --- /dev/null +++ b/exprs/lunar-client.nix @@ -0,0 +1,40 @@ +{ + appimageTools, + fetchurl, + lib, + makeWrapper, +}: let + pname = "lunar-client"; + version = "3.2.0"; + + src = fetchurl { + url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage"; + hash = "sha256-Y9SjcVQ+7tmX6vKdYuD4JtTDJNmMKliEN5Yl41/WJjs="; + }; + + 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; [mit]; # colon 3 + mainProgram = "lunar-client"; + maintainers = with maintainers; [zyansheep Technical27 surfaceflinger]; + platforms = ["x86_64-linux"]; + }; + } diff --git a/exprs/overlay.nix b/exprs/overlay.nix index 8e87c46..1527621 100644 --- a/exprs/overlay.nix +++ b/exprs/overlay.nix @@ -7,17 +7,5 @@ final: prev: { meta.knownVulnerabilities = []; # NixOS/nixpkgs#273611 }); - aseprite = prev.aseprite.overrideAttrs (old: rec { - version = "1.3.2"; - - src = prev.fetchFromGitHub { - owner = "aseprite"; - repo = "aseprite"; - rev = "v${version}"; - fetchSubmodules = true; - hash = "sha256-8PXqMDf2ATxmtFqyZlGip+DhGrdK8M6Ztte7fGH6Fmo="; - }; - - meta.license = prev.lib.licenses.mit; # removes unfree error - }); + lunar-client = prev.callPackage ./lunar-client.nix {}; } diff --git a/systems/desktop.nix b/systems/desktop.nix index 56767d1..cf68162 100644 --- a/systems/desktop.nix +++ b/systems/desktop.nix @@ -137,6 +137,7 @@ in { gnome.gnome-calculator jetbrains.idea-ultimate libreoffice-fresh + lunar-client mate.eom mold mpv