From 32b59d0961a4fdb770727480b8d34f4c976295d6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 13 Mar 2018 23:46:11 +0100 Subject: [PATCH] gnome3.gnome-shell-extensions: fix build --- .../core/gnome-shell-extensions/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix index d3d87078d84d..0d856e494c38 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix @@ -1,5 +1,4 @@ -{ stdenv, intltool, fetchurl, libgtop, pkgconfig, gtk3, glib -, bash, makeWrapper, itstool, gnome3, file }: +{ stdenv, fetchurl, meson, ninja, gettext, pkgconfig, spidermonkey_52, glib, gnome3 }: stdenv.mkDerivation rec { name = "gnome-shell-extensions-${version}"; @@ -11,16 +10,18 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-shell-extensions"; attrPath = "gnome3.gnome-shell-extensions"; }; + updateScript = gnome3.updateScript { + packageName = "gnome-shell-extensions"; + attrPath = "gnome3.gnome-shell-extensions"; + }; }; doCheck = true; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 glib libgtop intltool itstool - makeWrapper file ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext glib ]; + buildInputs = [ spidermonkey_52 ]; - configureFlags = [ "--enable-extensions=all" ]; + mesonFlags = [ "-Dextension_set=all" ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/GnomeShell/Extensions;