bottles: move patching from preConfigure into postPatch
This commit is contained in:
parent
d002c9f58f
commit
b587fa2897
|
@ -32,6 +32,11 @@ python3Packages.buildPythonApplication rec {
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
chmod +x build-aux/meson/postinstall.py
|
chmod +x build-aux/meson/postinstall.py
|
||||||
patchShebangs 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 = [
|
nativeBuildInputs = [
|
||||||
|
@ -86,14 +91,6 @@ python3Packages.buildPythonApplication rec {
|
||||||
strictDeps = false; # broken with gobject-introspection setup hook, see https://github.com/NixOS/nixpkgs/issues/56943
|
strictDeps = false; # broken with gobject-introspection setup hook, see https://github.com/NixOS/nixpkgs/issues/56943
|
||||||
dontWrapGApps = true; # prevent double wrapping
|
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 = ''
|
preFixup = ''
|
||||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||||
'';
|
'';
|
||||||
|
|
Loading…
Reference in a new issue