Merge #29392: gnome3: 3.24 -> 3.26

It might be slightly confusing that a couple of the changes will be twice
in the history, but let's merge this way.

1 files changed, 2 insertions, 7 deletions

diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix
index 482d6ae64a40..dd607e01caef 100644
--- a/pkgs/desktops/gnome-3/core/gjs/default.nix
+++ b/pkgs/desktops/gnome-3/core/gjs/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, gnome3, gtk3, gobjectIntrospection
-, spidermonkey_38, pango, readline, glib, libxml2, dbus }:
+, spidermonkey_52, pango, readline, glib, libxml2, dbus }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
@@ -7,12 +7,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libxml2 gobjectIntrospection gtk3 glib pango readline dbus ];
 
-  propagatedBuildInputs = [ spidermonkey_38 ];
-
-  # GJS expects mozjs-38.pc but spidermonkey_38 only provides js.pc
-  preConfigure = ''
-    sed -i s/mozjs-38/js/ configure
-  '';
+  propagatedBuildInputs = [ spidermonkey_52 ];
 
   postInstall = ''
     sed 's|-lreadline|-L${readline.out}/lib -lreadline|g' -i $out/lib/libgjs.la