diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-08-14 11:38:00 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-08-14 11:38:00 +0200 |
| commit | 9eb901b70ddda39b714619804864f4d4c06a2edd (patch) | |
| tree | 8cd3aa260535c7aad9c335cf54deef13c05a1cd0 /pkgs/desktops/gnome-3 | |
| parent | 62dac1bdd9b91a47eb7266bed94558cafd7ad07f (diff) | |
| parent | 505e94256ef247dc5425068304583f8dc1b2064a (diff) | |
| download | nixpkgs-9eb901b70ddda39b714619804864f4d4c06a2edd.tar nixpkgs-9eb901b70ddda39b714619804864f4d4c06a2edd.tar.gz nixpkgs-9eb901b70ddda39b714619804864f4d4c06a2edd.tar.bz2 nixpkgs-9eb901b70ddda39b714619804864f4d4c06a2edd.tar.lz nixpkgs-9eb901b70ddda39b714619804864f4d4c06a2edd.tar.xz nixpkgs-9eb901b70ddda39b714619804864f4d4c06a2edd.tar.zst nixpkgs-9eb901b70ddda39b714619804864f4d4c06a2edd.zip | |
Merge remote-tracking branch 'origin/gcc-6' into staging
Diffstat (limited to 'pkgs/desktops/gnome-3')
| -rw-r--r-- | pkgs/desktops/gnome-3/3.22/core/gjs/default.nix | 4 | ||||
| -rw-r--r-- | 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 ac5572decb8..1141db03c40 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_24, pango, readline, glib, libxml2, dbus }: +, spidermonkey_31, 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_24 ]; + propagatedBuildInputs = [ spidermonkey_31 ]; 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 1f4ef08f9b1..7af8d7c531b 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}.0"; - major = "1.46"; + name = "gjs-${major}.4"; + major = "1.47"; src = fetchurl { url = "mirror://gnome/sources/gjs/${major}/${name}.tar.xz"; - sha256 = "2283591fa70785443793e1d7db66071b36052d707075f229baeb468d8dd25ad4"; + sha256 = "05x9yk3h53wn9fpwbcxl8yz71znhwhzwy7412di77x88ghkxi2c1"; }; } |