diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-10-30 13:37:39 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-10-30 13:37:39 +0100 |
| commit | 7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769 (patch) | |
| tree | 38e753812c0ceba947d65ec0555a5a66c1a5aa4e /nixpkgs/pkgs/development/libraries/libvarlink | |
| parent | 46cf147fc42b72f68ecd52b3b03a8bfd6077f42b (diff) | |
| parent | 63678e9f3d3afecfeafa0acead6239cdb447574c (diff) | |
| download | nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.tar nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.tar.gz nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.tar.bz2 nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.tar.lz nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.tar.xz nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.tar.zst nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.zip | |
Merge commit '63678e9f3d3afecfeafa0acead6239cdb447574c' into HEAD
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libvarlink')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libvarlink/default.nix | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libvarlink/default.nix b/nixpkgs/pkgs/development/libraries/libvarlink/default.nix index 9e4b96a9d798..941ee900edb2 100644 --- a/nixpkgs/pkgs/development/libraries/libvarlink/default.nix +++ b/nixpkgs/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; |