From 75368305af5c40ff0d75148fa12fc7cf50d241c4 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 25 Oct 2023 19:13:47 -0400 Subject: libvarlink: fix cross compilation by using the correct python3 for varlink-wrapper.py --- pkgs/development/libraries/libvarlink/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'pkgs/development/libraries/libvarlink') diff --git a/pkgs/development/libraries/libvarlink/default.nix b/pkgs/development/libraries/libvarlink/default.nix index 9e4b96a9d798c..941ee900edb2c 100644 --- a/pkgs/development/libraries/libvarlink/default.nix +++ b/pkgs/development/libraries/libvarlink/default.nix @@ -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; -- cgit 1.4.1