Merge pull request #263463 from NickCao/libvarlink

libvarlink: fix cross compilation by using the correct python3 for va…
This commit is contained in:
Artturi 2023-10-26 07:55:32 +03:00 committed by GitHub
commit 62a60025f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -19,18 +19,15 @@ stdenv.mkDerivation (finalAttrs: {
sha256 = "sha256-oUy9HhybNMjRBWoqqal1Mw8cC5RddgN4izxAl0cgnKE=";
};
nativeBuildInputs = [ meson ninja ];
nativeBuildInputs = [ meson ninja python3 ];
postPatch = ''
substituteInPlace varlink-wrapper.py \
--replace "/usr/bin/env python3" "${python3}/bin/python3"
# test-object: ../lib/test-object.c:129: main: Assertion `setlocale(LC_NUMERIC, "de_DE.UTF-8") != 0' failed.
# PR that added it https://github.com/varlink/libvarlink/pull/27
substituteInPlace lib/test-object.c \
--replace 'assert(setlocale(LC_NUMERIC, "de_DE.UTF-8") != 0);' ""
patchShebangs lib/test-symbols.sh
patchShebangs lib/test-symbols.sh varlink-wrapper.py
'';
doCheck = true;