From a558519a55065bc48bbe535d3d0fbc08c183e910 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 4 Feb 2017 11:53:37 +0100 Subject: [PATCH] Revert "gnome3.gjs: 1.46 -> 1.47, use spidermonkey_31" This reverts commit bcfca9224f6ed0933562fdf3d3aa8ff226023d22. It broke gnome-shell build and I can't see a quick way to fix it; cause: removal of gjs-internals-1.0.pc. Stable gnome-shell update didn't help. --- pkgs/desktops/gnome-3/3.22/core/gjs/default.nix | 4 ++-- pkgs/desktops/gnome-3/3.22/core/gjs/src.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.22/core/gjs/default.nix b/pkgs/desktops/gnome-3/3.22/core/gjs/default.nix index 1141db03c40..ac5572decb8 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gjs/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gjs/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv, pkgconfig, gnome3, gtk3, gobjectIntrospection -, spidermonkey_31, pango, readline, glib, libxml2, dbus }: +, spidermonkey_24, pango, readline, glib, libxml2, dbus }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; buildInputs = [ libxml2 gobjectIntrospection pkgconfig gtk3 glib pango readline dbus ]; - propagatedBuildInputs = [ spidermonkey_31 ]; + propagatedBuildInputs = [ spidermonkey_24 ]; postInstall = '' sed 's|-lreadline|-L${readline.out}/lib -lreadline|g' -i $out/lib/libgjs.la diff --git a/pkgs/desktops/gnome-3/3.22/core/gjs/src.nix b/pkgs/desktops/gnome-3/3.22/core/gjs/src.nix index 7af8d7c531b..1f4ef08f9b1 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gjs/src.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gjs/src.nix @@ -1,11 +1,11 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: rec { - name = "gjs-${major}.4"; - major = "1.47"; + name = "gjs-${major}.0"; + major = "1.46"; src = fetchurl { url = "mirror://gnome/sources/gjs/${major}/${name}.tar.xz"; - sha256 = "05x9yk3h53wn9fpwbcxl8yz71znhwhzwy7412di77x88ghkxi2c1"; + sha256 = "2283591fa70785443793e1d7db66071b36052d707075f229baeb468d8dd25ad4"; }; }