diff --git a/modules/linux/gaming/default.nix b/modules/linux/gaming/default.nix index 12233f7..4c1ace5 100755 --- a/modules/linux/gaming/default.nix +++ b/modules/linux/gaming/default.nix @@ -44,16 +44,17 @@ in mangojuice r2modman - (modrinth-app.overrideAttrs (oldAttrs: { - buildCommand = - '' - gappsWrapperArgs+=( - --set GDK_BACKEND x11 - --set WEBKIT_DISABLE_DMABUF_RENDERER 1 - ) - '' - + oldAttrs.buildCommand; - })) + modrinth-app-bin + # (modrinth-app.overrideAttrs (oldAttrs: { + # buildCommand = + # '' + # gappsWrapperArgs+=( + # --set GDK_BACKEND x11 + # --set WEBKIT_DISABLE_DMABUF_RENDERER 1 + # ) + # '' + # + oldAttrs.buildCommand; + # })) (wine-discord-ipc-bridge.overrideAttrs ( final: prev: { @@ -102,6 +103,7 @@ in liminalOS.config.extraUnfreePackages = lib.mkIf config.liminalOS.config.allowUnfree [ "modrinth-app" "modrinth-app-unwrapped" + "ModrinthApp" "steam" "steam-unwrapped" ]; diff --git a/pkgs/by-name/modrinth-app-bin/default.nix b/pkgs/by-name/modrinth-app-bin/default.nix new file mode 100644 index 0000000..8cd2ea3 --- /dev/null +++ b/pkgs/by-name/modrinth-app-bin/default.nix @@ -0,0 +1,43 @@ +{ + appimageTools, + fetchurl, + lib, +}: +let + pname = "ModrinthApp"; + version = "0.9.2"; + src = fetchurl { + url = "https://launcher-files.modrinth.com/versions/${version}/linux/Modrinth%20App_${version}_amd64.AppImage"; + hash = "sha256-lL2FVNeb/IUNFC/BjWNOk3cDIxY2f+eQj0QcnHxwVfw="; + }; + appimageContents = appimageTools.extractType1 { inherit pname version src; }; +in +appimageTools.wrapType2 { + inherit pname src version; + + extraInstallCommands = '' + mkdir -p $out/share/applications + mkdir -p $out/share/icons/hicolor/256x256@2/apps + mkdir -p $out/share/icons/hicolor/128x128/apps + + ln -s ${appimageContents}/'Modrinth App.desktop' $out/share/applications + ln -s ${appimageContents}/ModrinthApp.png $out/share/icons/hicolor/256x256@2/apps/ModrinthApp.png + ln -s ${appimageContents}/ModrinthApp.png $out/share/icons/hicolor/128x128/apps/ModrinthApp.png + ''; + + meta = { + description = "Modrinth's game launcher"; + longDescription = '' + A unique, open source launcher that allows you to play your favorite mods, + and keep them up to date, all in one neat little package + ''; + homepage = "https://modrinth.com"; + license = with lib.licenses; [ + gpl3Plus + unfreeRedistributable + ]; + maintainers = with lib.maintainers; [ getchoo ]; + mainProgram = "ModrinthApp"; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/default.nix b/pkgs/default.nix index 0bac1bf..96bce53 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -5,4 +5,5 @@ in final: prev: { rdrview = callPackage ./by-name/rdrview { }; wine-discord-ipc-bridge = callPackage ./by-name/wine-discord-ipc-bridge { }; + modrinth-app-bin = callPackage ./by-name/modrinth-app-bin { }; }