From 5f5c176407987f1997a703b8187648fb61082bce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Wed, 18 Dec 2019 14:59:02 +0100 Subject: [PATCH] gjs: 1.58.5 -> 1.64.0 Now uses spidermonkey_68 --- pkgs/development/libraries/gjs/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index d63c06981273..aa8225384524 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -1,11 +1,13 @@ { fetchurl , stdenv +, meson +, ninja , pkgconfig , gnome3 , gtk3 , atk , gobject-introspection -, spidermonkey_60 +, spidermonkey_68 , pango , cairo , readline @@ -19,16 +21,18 @@ stdenv.mkDerivation rec { pname = "gjs"; - version = "1.58.5"; + version = "1.64.0"; src = fetchurl { url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0fm1szmhdawvgbf9fh6vvkv1fdvbn888fciyi2wkhx48kz09jvg7"; + sha256 = "0vynivp1d10jkxfcgb5vcjkba5dvi7amkm8axmyad7l4dfy4qf36"; }; outputs = [ "out" "dev" "installedTests" ]; nativeBuildInputs = [ + meson + ninja pkgconfig makeWrapper libxml2 # for xml-stripblanks @@ -38,7 +42,7 @@ stdenv.mkDerivation rec { gobject-introspection cairo readline - spidermonkey_60 + spidermonkey_68 dbus # for dbus-run-session ]; @@ -46,8 +50,8 @@ stdenv.mkDerivation rec { glib ]; - configureFlags = [ - "--enable-installed-tests" + mesonFlags = [ + "-Dprofiler=disabled" ]; postPatch = ''