diff --git a/modules/linux/gaming/default.nix b/modules/linux/gaming/default.nix index f54e8df..12233f7 100755 --- a/modules/linux/gaming/default.nix +++ b/modules/linux/gaming/default.nix @@ -43,7 +43,17 @@ in mangohud mangojuice r2modman - modrinth-app + + (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: { diff --git a/pkgs/by-name/modrinth-app/default.nix b/pkgs/by-name/modrinth-app/default.nix deleted file mode 100644 index d790923..0000000 --- a/pkgs/by-name/modrinth-app/default.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ - lib, - stdenv, - addDriverRunpath, - alsa-lib, - flite, - glib-networking, - jdk17, - jdk21, - jdk8, - jdks ? [ - jdk8 - jdk17 - jdk21 - ], - libGL, - libjack2, - libpulseaudio, - modrinth-app-unwrapped, - pipewire, - symlinkJoin, - udev, - wrapGAppsHook4, - xorg, -}: - -symlinkJoin rec { - name = "${pname}-${version}"; - pname = "modrinth-app"; - inherit (modrinth-app-unwrapped) version; - - paths = [ modrinth-app-unwrapped ]; - - nativeBuildInputs = [ wrapGAppsHook4 ]; - - buildInputs = [ glib-networking ]; - - runtimeDependencies = lib.optionalString stdenv.hostPlatform.isLinux ( - lib.makeLibraryPath [ - addDriverRunpath.driverLink - - # glfw - libGL - xorg.libX11 - xorg.libXcursor - xorg.libXext - xorg.libXrandr - xorg.libXxf86vm - - # lwjgl - (lib.getLib stdenv.cc.cc) - - # narrator support - flite - - # openal - alsa-lib - libjack2 - libpulseaudio - pipewire - - # oshi - udev - ] - ); - - postBuild = '' - gappsWrapperArgs+=( - --prefix PATH : ${lib.makeSearchPath "bin/java" jdks} - ${lib.optionalString stdenv.hostPlatform.isLinux '' - --prefix PATH : ${lib.makeBinPath [ xorg.xrandr ]} - --set LD_LIBRARY_PATH $runtimeDependencies - --set GDK_BACKEND x11 - --set WEBKIT_DISABLE_DMABUF_RENDERER 1 - ''} - ) - - wrapGAppsHook - ''; - # fixes nvidia broken modrinth - - meta = { - inherit (modrinth-app-unwrapped.meta) - description - longDescription - homepage - license - maintainers - mainProgram - platforms - broken - ; - }; -} diff --git a/pkgs/default.nix b/pkgs/default.nix index 82fe875..0bac1bf 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -3,7 +3,6 @@ let inherit (pkgs) callPackage; in final: prev: { - modrinth-app = callPackage ./by-name/modrinth-app { }; rdrview = callPackage ./by-name/rdrview { }; wine-discord-ipc-bridge = callPackage ./by-name/wine-discord-ipc-bridge { }; }