diff options
Diffstat (limited to 'pkgs/desktops/gnome-3/core/gjs')
-rw-r--r-- | pkgs/desktops/gnome-3/core/gjs/default.nix | 9 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/core/gjs/src.nix | 6 |
2 files changed, 5 insertions, 10 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 diff --git a/pkgs/desktops/gnome-3/core/gjs/src.nix b/pkgs/desktops/gnome-3/core/gjs/src.nix index 27162fcbfd45..d3112f02f8ac 100644 --- a/pkgs/desktops/gnome-3/core/gjs/src.nix +++ b/pkgs/desktops/gnome-3/core/gjs/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gjs-1.48.6"; + name = "gjs-1.50.2"; src = fetchurl { - url = mirror://gnome/sources/gjs/1.48/gjs-1.48.6.tar.xz; - sha256 = "e85f65ba4b38bf80b6174949dfe6fce89e88b8213bbdde4ac1fde473c08bd312"; + url = mirror://gnome/sources/gjs/1.50/gjs-1.50.2.tar.xz; + sha256 = "2fad902cf7a7806454121c03918755c646fcfd6b08b52d488987db4e2d691ff3"; }; } |