b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

bottles: move patching from preConfigure into postPatch

Browse source
This commit is contained in:
Sandro Jäckel 2022-04-18 03:03:29 +02:00
parent d002c9f58f
commit b587fa2897
No known key found for this signature in database
GPG key ID: 3AF5A43A3EECC2E5
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/applications/misc/bottles/default.nix
View file

@ -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[@]}")
'';