From 173f43aeb03af5aeb8a0368d65b975172ff95ef8 Mon Sep 17 00:00:00 2001 From: TheK0tYaRa Date: Fri, 13 Mar 2026 23:18:52 +0200 Subject: [PATCH] winetricks fix, lutris bump --- custom/override.nix | 36 +++++++++++++++++++++++++++++++++++- flake.lock | 18 +++++++++--------- home.nix | 4 +++- 3 files changed, 47 insertions(+), 11 deletions(-) diff --git a/custom/override.nix b/custom/override.nix index 6d06ba3..711198c 100644 --- a/custom/override.nix +++ b/custom/override.nix @@ -1,4 +1,8 @@ -final: prev: { +final: prev: +let + winePkg = final.wineWow64Packages.full; +in +{ # xdg-desktop-portal-cosmic = prev.xdg-desktop-portal-cosmic.overrideAttrs (old: { # postPatch = (old.postPatch or "") + '' # unitDir="$out/lib/systemd/user" @@ -99,6 +103,36 @@ final: prev: { }); }) ]; + lutris-unwrapped = prev.lutris-unwrapped.overrideAttrs ( + old: + let + version = "0.5.22"; + in + { + src = prev.fetchFromGitHub { + owner = "lutris"; + repo = "lutris"; + tag = "v${version}"; + hash = "sha256-4mNknvfJQJEPZjQoNdKLQcW4CI93D6BUDPj8LtD940A="; + }; + } + ); + winetricks = final.symlinkJoin { + name = "winetricks-${prev.winetricks.version}"; + paths = [ prev.winetricks ]; + nativeBuildInputs = [ final.makeWrapper ]; + + postBuild = '' + wrapProgram "$out/bin/winetricks" \ + --prefix PATH : "${final.lib.makeBinPath [ winePkg ]}" \ + --set-default WINE "${winePkg}/bin/wine" \ + --run 'wine_dir="$(${final.coreutils}/bin/dirname "$(${final.coreutils}/bin/readlink -f "$WINE")")"' \ + --run ': "''${WINE_BIN:=$wine_dir/.wine}"' \ + --run 'export WINE WINESERVER WINE_BIN WINESERVER_BIN' + ''; + + meta = prev.winetricks.meta; + }; # winetricks = prev.winetricks.overrideAttrs ( # old: # let diff --git a/flake.lock b/flake.lock index 71c43ee..d670d25 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1773279046, - "narHash": "sha256-k1S9VEaiRgRrfwolWKV+n3YKpfnQCoE+3M9BDrWVwyI=", + "lastModified": 1773421907, + "narHash": "sha256-TN8Qf8RhmOX7TAwhdjGaE/clgAxzfHwsOjGSxz0Bz/0=", "owner": "sadjow", "repo": "claude-code-nix", - "rev": "00189c0d55fd64d8f7880979d9f91dcb675996e0", + "rev": "4746a848ccb3e1ba1a1c99fd063bf998045b81ac", "type": "github" }, "original": { @@ -451,11 +451,11 @@ ] }, "locked": { - "lastModified": 1773367248, - "narHash": "sha256-FFMc1uAwy2GYasd0rdNDVxKyAgzuoJH2M+GglBQbqf0=", + "lastModified": 1773422513, + "narHash": "sha256-MPjR48roW7CUMU6lu0+qQGqj92Kuh3paIulMWFZy+NQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "be0c641a6a5564caa33982faa1fe2c60d92131c7", + "rev": "ef12a9a2b0f77c8fa3dda1e7e494fca668909056", "type": "github" }, "original": { @@ -695,11 +695,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1773110118, - "narHash": "sha256-mPAG8phMbCReKSiKAijjjd3v7uVcJOQ75gSjGJjt/Rk=", + "lastModified": 1773231277, + "narHash": "sha256-Xy3WEpUAbpsz8ydgvVAQAGGB/WB+8cNA5cshiL0McTI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e607cb5360ff1234862ac9f8839522becb853bb9", + "rev": "75690239f08f885ca9b0267580101f60d10fbe62", "type": "github" }, "original": { diff --git a/home.nix b/home.nix index 39d5a3a..ee3f644 100644 --- a/home.nix +++ b/home.nix @@ -91,6 +91,8 @@ heroic vintagestory prismlauncher + # bottles # sunthetik2 mouse issues + # umu-launcher ### neural networks dsearch @@ -554,7 +556,7 @@ # runner_executable = "${pkgs.wineWowPackages.full}/bin/wine"; }; system = { - game_path = "/home/thek0tyara/Documents/lutris"; + game_path = "/home/thek0tyara/Documents/games/lutris"; disable_runtime = false; prefer_system_libs = true; };