public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gnome3.gjs: 1.48.6 → 1.50.2

Browse Source
This commit is contained in:
Jan Tojnar 2017-10-04 23:43:04 +02:00
parent 0f06bab3f3
commit 699aa4fc86
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/desktops/gnome-3/core/gjs/default.nix
View File

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

6
pkgs/desktops/gnome-3/core/gjs/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update # Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: { fetchurl: {
name = "gjs-1.48.6"; name = "gjs-1.50.2";
src = fetchurl { src = fetchurl {
url = mirror://gnome/sources/gjs/1.48/gjs-1.48.6.tar.xz; url = mirror://gnome/sources/gjs/1.50/gjs-1.50.2.tar.xz;
sha256 = "e85f65ba4b38bf80b6174949dfe6fce89e88b8213bbdde4ac1fde473c08bd312"; sha256 = "2fad902cf7a7806454121c03918755c646fcfd6b08b52d488987db4e2d691ff3";
}; };
} }