From b587fa2897da0a53939d5994ee8a6f30c498e0c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 18 Apr 2022 03:03:29 +0200 Subject: [PATCH] bottles: move patching from preConfigure into postPatch --- pkgs/applications/misc/bottles/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index e541e54aafec..45a91522a2ab 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -32,6 +32,11 @@ python3Packages.buildPythonApplication rec { postPatch = '' chmod +x build-aux/meson/postinstall.py patchShebangs build-aux/meson/postinstall.py + + substituteInPlace src/backend/wine/winecommand.py \ + --replace \ + 'self.__get_runner()' \ + '(lambda r: (f"${steam-run}/bin/steam-run {r}", r)[r == "wine" or r == "wine64"])(self.__get_runner())' ''; nativeBuildInputs = [ @@ -86,14 +91,6 @@ python3Packages.buildPythonApplication rec { strictDeps = false; # broken with gobject-introspection setup hook, see https://github.com/NixOS/nixpkgs/issues/56943 dontWrapGApps = true; # prevent double wrapping - preConfigure = '' - patchShebangs build-aux/meson/postinstall.py - substituteInPlace src/backend/wine/winecommand.py \ - --replace \ - 'self.__get_runner()' \ - '(lambda r: (f"${steam-run}/bin/steam-run {r}", r)[r == "wine" or r == "wine64"])(self.__get_runner())' - ''; - preFixup = '' makeWrapperArgs+=("''${gappsWrapperArgs[@]}") '';