@@ -1,6 +1,6 @@
11{ fetchurl
2−, fetchpatch
3−, lib, stdenv
2+, lib
3+, stdenv
44, meson
55, ninja
66, pkg-config
@@ -30,20 +30,16 @@ let
3030 ];
3131in stdenv.mkDerivation rec {
3232 pname = "gjs";
33− version = "1.68.0";
33+ version = "1.68.1";
34+
35+ outputs = [ "out" "dev" "installedTests" ];
3436
3537 src = fetchurl {
3638 url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
37− sha256 = "1vqsmzy2wmyhmq37y2c6jl0wq4xnicf0z7k6jaxn3aw11sh783ph";
39+ sha256 = "0w2cbfpmc6alz7z8ycchhlkn586av5y8zk2xmgwzq10i0k13xyig";
3840 };
3941
4042 patches = [
41− # Fixes https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/3961.
42− (fetchpatch {
43− url = "https://gitlab.gnome.org/GNOME/gjs/-/commit/58337929c338e7b5c0a35196d783d3b2be542900.patch";
44− sha256 = "QgmU+d838fU5LiS4lhTF+179U1lY1L5tJbYtX/oc68k=";
45− })
46−
4743 # Hard-code various paths
4844 ./fix-paths.patch
4945
@@ -51,8 +47,6 @@ in stdenv.mkDerivation rec {
5147 ./installed-tests-path.patch
5248 ];
5349
54− outputs = [ "out" "dev" "installedTests" ];
55−
5650 nativeBuildInputs = [
5751 meson
5852 ninja
@@ -98,6 +92,7 @@ in stdenv.mkDerivation rec {
9892 mkdir -p $out/lib $installedTests/libexec/installed-tests/gjs
9993 ln -s $PWD/libgjs.so.0 $out/lib/libgjs.so.0
10094 ln -s $PWD/installed-tests/js/libgimarshallingtests.so $installedTests/libexec/installed-tests/gjs/libgimarshallingtests.so
95+ ln -s $PWD/installed-tests/js/libgjstesttools/libgjstesttools.so $installedTests/libexec/installed-tests/gjs/libgjstesttools.so
10196 ln -s $PWD/installed-tests/js/libregress.so $installedTests/libexec/installed-tests/gjs/libregress.so
10297 ln -s $PWD/installed-tests/js/libwarnlib.so $installedTests/libexec/installed-tests/gjs/libwarnlib.so
10398 '';