From 5d39d988dcfba645909b182b2943105342ee8b3c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 10 Jun 2020 23:13:08 +0200 Subject: [PATCH] gjs: Fix locale detection The build was complaining: meson.build:660: WARNING: Your libc does not have the C.UTF-8 locale and no other suitable UTF-8 fallback locale could be found. You can still build GJS, but some tests will fail. The tests do not actually seem to be affected but still. --- pkgs/development/libraries/gjs/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index 8cc5aca348a5..357bf076459a 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -17,6 +17,7 @@ , dbus , gdk-pixbuf , makeWrapper +, which , xvfb_run , nixosTests }: @@ -42,6 +43,7 @@ in stdenv.mkDerivation rec { ninja pkgconfig makeWrapper + which # for locale detection libxml2 # for xml-stripblanks ]; @@ -77,6 +79,7 @@ in stdenv.mkDerivation rec { doCheck = true; postPatch = '' + patchShebangs build/choose-tests-locale.sh substituteInPlace installed-tests/debugger-test.sh --subst-var-by gjsConsole $out/bin/gjs-console '';