diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-06-10 23:13:08 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-06-10 23:14:11 +0200 |
| commit | 5d39d988dcfba645909b182b2943105342ee8b3c (patch) | |
| tree | 8aca4b7769b095a171400c93ba7040e8a58278ac /pkgs | |
| parent | 6635e78fad0996c71fb67d0ac7cf8baca7f532e0 (diff) | |
| download | nixpkgs-5d39d988dcfba645909b182b2943105342ee8b3c.tar nixpkgs-5d39d988dcfba645909b182b2943105342ee8b3c.tar.gz nixpkgs-5d39d988dcfba645909b182b2943105342ee8b3c.tar.bz2 nixpkgs-5d39d988dcfba645909b182b2943105342ee8b3c.tar.lz nixpkgs-5d39d988dcfba645909b182b2943105342ee8b3c.tar.xz nixpkgs-5d39d988dcfba645909b182b2943105342ee8b3c.tar.zst nixpkgs-5d39d988dcfba645909b182b2943105342ee8b3c.zip | |
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.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/gjs/default.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index 8cc5aca348a..357bf076459 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 ''; |