From c2918476e43dab5295704840a167592c6e7b2ebd Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sun, 26 Jan 2025 16:37:47 +0100 Subject: [PATCH 1/2] proton-ge-bin: refactor Signed-off-by: Sefa Eyeoglu --- pkgs/by-name/pr/proton-ge-bin/package.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/pr/proton-ge-bin/package.nix b/pkgs/by-name/pr/proton-ge-bin/package.nix index ab00ecc360b3..4b7ffc28cff4 100644 --- a/pkgs/by-name/pr/proton-ge-bin/package.nix +++ b/pkgs/by-name/pr/proton-ge-bin/package.nix @@ -13,13 +13,17 @@ stdenvNoCC.mkDerivation (finalAttrs: { hash = "sha256-L0GkzpSn4f6dLDOm2iDJr8D1DINTHNW9Kkn1xFTuqfo="; }; + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + outputs = [ "out" "steamcompattool" ]; - buildCommand = '' - runHook preBuild + installPhase = '' + runHook preInstall # Make it impossible to add to an environment. You should use the appropriate NixOS option. # Also leave some breadcrumbs in the file. @@ -30,10 +34,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { rm $steamcompattool/{compatibilitytool.vdf,proton,version} cp $src/{compatibilitytool.vdf,proton,version} $steamcompattool - sed -i -r 's|GE-Proton[0-9]*-[0-9]*|GE-Proton|' $steamcompattool/compatibilitytool.vdf - sed -i -r 's|GE-Proton[0-9]*-[0-9]*|GE-Proton|' $steamcompattool/proton + runHook postInstall + ''; - runHook postBuild + preFixup = '' + substituteInPlace "$steamcompattool/compatibilitytool.vdf" \ + --replace-fail "${finalAttrs.version}" "GE-Proton" + substituteInPlace "$steamcompattool/proton" \ + --replace-fail "${finalAttrs.version}" "GE-Proton" ''; /* From a94bd68c17172818c7c1d8bcbdf3248cc25ebe7c Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sun, 26 Jan 2025 16:37:56 +0100 Subject: [PATCH 2/2] proton-ge-bin: add Scrumplex as maintainer Signed-off-by: Sefa Eyeoglu --- pkgs/by-name/pr/proton-ge-bin/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/pr/proton-ge-bin/package.nix b/pkgs/by-name/pr/proton-ge-bin/package.nix index 4b7ffc28cff4..059e5c22e1ec 100644 --- a/pkgs/by-name/pr/proton-ge-bin/package.nix +++ b/pkgs/by-name/pr/proton-ge-bin/package.nix @@ -70,6 +70,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ NotAShelf + Scrumplex shawn8901 ]; platforms = [ "x86_64-linux" ];