mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-19 02:44:17 +03:00
Merge pull request #263463 from NickCao/libvarlink
libvarlink: fix cross compilation by using the correct python3 for va…
This commit is contained in:
commit
62a60025f7
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user