gjs: fix installed tests
They were already failing on master (with pango 1.47 and gjs 1.66): (process:1186): Gjs-CRITICAL **: 12:36:09.500: JS ERROR: Error: Requiring Gtk, version 3.0: Typelib file for namespace 'HarfBuzz', version '0.0' not found machine # @/nix/store/mca5jqi26f3h3s78p54bp59x4klyrch5-gjs-1.66.2-installedTests/libexec/installed-tests/gjs/js/testLegacyGObject.js:9:13 HarfBuzz is likely pulled in through Pango. Possibly introduced in https://github.com/NixOS/nixpkgs/pull/93799. But then why did not I notice that in GNOME 3.38 bump?
This commit is contained in:
parent
5259071cd8
commit
96fc9752af
1 changed files with 16 additions and 9 deletions
|
@ -16,6 +16,7 @@
|
||||||
, libxml2
|
, libxml2
|
||||||
, dbus
|
, dbus
|
||||||
, gdk-pixbuf
|
, gdk-pixbuf
|
||||||
|
, harfbuzz
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
, which
|
, which
|
||||||
, xvfb_run
|
, xvfb_run
|
||||||
|
@ -25,7 +26,7 @@
|
||||||
let
|
let
|
||||||
testDeps = [
|
testDeps = [
|
||||||
gobject-introspection # for Gio and cairo typelibs
|
gobject-introspection # for Gio and cairo typelibs
|
||||||
gtk3 atk pango.out gdk-pixbuf
|
gtk3 atk pango.out gdk-pixbuf harfbuzz
|
||||||
];
|
];
|
||||||
in stdenv.mkDerivation rec {
|
in stdenv.mkDerivation rec {
|
||||||
pname = "gjs";
|
pname = "gjs";
|
||||||
|
@ -36,6 +37,20 @@ in stdenv.mkDerivation rec {
|
||||||
sha256 = "1vqsmzy2wmyhmq37y2c6jl0wq4xnicf0z7k6jaxn3aw11sh783ph";
|
sha256 = "1vqsmzy2wmyhmq37y2c6jl0wq4xnicf0z7k6jaxn3aw11sh783ph";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# Fixes https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/3961.
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://gitlab.gnome.org/GNOME/gjs/-/commit/58337929c338e7b5c0a35196d783d3b2be542900.patch";
|
||||||
|
sha256 = "QgmU+d838fU5LiS4lhTF+179U1lY1L5tJbYtX/oc68k=";
|
||||||
|
})
|
||||||
|
|
||||||
|
# Hard-code various paths
|
||||||
|
./fix-paths.patch
|
||||||
|
|
||||||
|
# Allow installing installed tests to a separate output.
|
||||||
|
./installed-tests-path.patch
|
||||||
|
];
|
||||||
|
|
||||||
outputs = [ "out" "dev" "installedTests" ];
|
outputs = [ "out" "dev" "installedTests" ];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -68,14 +83,6 @@ in stdenv.mkDerivation rec {
|
||||||
"-Dinstalled_test_prefix=${placeholder "installedTests"}"
|
"-Dinstalled_test_prefix=${placeholder "installedTests"}"
|
||||||
];
|
];
|
||||||
|
|
||||||
patches = [
|
|
||||||
# Hard-code various paths
|
|
||||||
./fix-paths.patch
|
|
||||||
|
|
||||||
# Allow installing installed tests to a separate output.
|
|
||||||
./installed-tests-path.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
Loading…
Reference in a new issue