diff options
Diffstat (limited to 'pkgs/desktops/gnome-3/extensions')
-rw-r--r-- | pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix | 4 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/extensions/impatience.nix | 11 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/extensions/system-monitor/default.nix (renamed from pkgs/desktops/gnome-3/extensions/system-monitor.nix) | 23 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/extensions/system-monitor/paths_and_nonexisting_dirs.patch | 23 |
4 files changed, 48 insertions, 13 deletions
diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix index 87e0d79dce68..152b9522beff 100644 --- a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix +++ b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "gnome-shell-dash-to-dock-${version}"; - version = "v62"; + version = "v63"; src = fetchFromGitHub { owner = "micheleg"; repo = "dash-to-dock"; rev = "extensions.gnome.org-" + version; - sha256 = "1kmf7vxhd1c1zgaim1pwmcmsg0kffng7hcl5gfcy5qb5yvb4dy5d"; + sha256 = "140ih4l3nn2lbgw684xjvkhqxflr1xg2vm1m46z632bb0y3py4yg"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/extensions/impatience.nix b/pkgs/desktops/gnome-3/extensions/impatience.nix index d82ff652bd0f..24b4c1cf703f 100644 --- a/pkgs/desktops/gnome-3/extensions/impatience.nix +++ b/pkgs/desktops/gnome-3/extensions/impatience.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "gnome-shell-impatience-${version}"; - version = "6564c21e4caf4a6bc5fe2bf21116d7c15408d494"; + version = "0.4.5"; src = fetchFromGitHub { owner = "timbertson"; repo = "gnome-shell-impatience"; - rev = version; - sha256 = "10zyj42i07dcvaciv47qgkcs5g5n2bpc8a0m6fsimfi0442iwlcn"; + rev = "version-${version}"; + sha256 = "0kvdhlz41fjyqdgcfw6mrr9nali6wg2qwji3dvykzfi0aypljzpx"; }; buildInputs = [ @@ -20,7 +20,8 @@ stdenv.mkDerivation rec { ''; installPhase = '' - cp -r impatience $out + mkdir -p $out/share/gnome-shell/extensions + cp -r impatience $out/share/gnome-shell/extensions/${uuid} ''; uuid = "impatience@gfxmonk.net"; @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Speed up builtin gnome-shell animations"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ aneeshusa timbertson ]; + maintainers = with maintainers; [ aneeshusa timbertson tiramiseb ]; homepage = http://gfxmonk.net/dist/0install/gnome-shell-impatience.xml; }; } diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor.nix b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix index 0c3e65633c81..eed34ae523d4 100644 --- a/pkgs/desktops/gnome-3/extensions/system-monitor.nix +++ b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix @@ -1,18 +1,28 @@ -{ stdenv, fetchFromGitHub, glib }: +{ config, stdenv, substituteAll, fetchFromGitHub, glib, glib_networking, libgtop, pkgs }: stdenv.mkDerivation rec { name = "gnome-shell-system-monitor-${version}"; - version = "8b31f070e9e59109d729661ced313d6a63e31787"; + version = "33"; src = fetchFromGitHub { owner = "paradoxxxzero"; repo = "gnome-shell-system-monitor-applet"; - rev = version; - sha256 = "0fm5zb6qp53jjy2mnkb8ybxygzjwpb314giiq0ywq87hhrpch8m3"; + rev = "v${version}"; + sha256 = "0abqaanl5r26x8f0mm0jgrjsr86hcx7mk75dx5c3zz7csw4nclkk"; }; buildInputs = [ glib + glib_networking + libgtop + ]; + + patches = [ + (substituteAll { + src = ./paths_and_nonexisting_dirs.patch; + gtop_path = "${libgtop}/lib/girepository-1.0"; + glib_net_path = "${glib_networking}/lib/girepository-1.0"; + }) ]; buildPhase = '' @@ -20,7 +30,8 @@ stdenv.mkDerivation rec { ''; installPhase = '' - cp -r ${uuid} $out + mkdir -p $out/share/gnome-shell/extensions + cp -r ${uuid} $out/share/gnome-shell/extensions ''; uuid = "system-monitor@paradoxxx.zero.gmail.com"; @@ -28,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Display system informations in gnome shell status bar"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ aneeshusa ]; + maintainers = with maintainers; [ aneeshusa tiramiseb ]; homepage = https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet; }; } diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/paths_and_nonexisting_dirs.patch b/pkgs/desktops/gnome-3/extensions/system-monitor/paths_and_nonexisting_dirs.patch new file mode 100644 index 000000000000..82e3d7c541ba --- /dev/null +++ b/pkgs/desktops/gnome-3/extensions/system-monitor/paths_and_nonexisting_dirs.patch @@ -0,0 +1,23 @@ +diff --git a/system-monitor@paradoxxx.zero.gmail.com/extension.js b/system-monitor@paradoxxx.zero.gmail.com/extension.js +index b4b7f15..d139135 100644 +--- a/system-monitor@paradoxxx.zero.gmail.com/extension.js ++++ b/system-monitor@paradoxxx.zero.gmail.com/extension.js +@@ -18,6 +18,9 @@ + + // Author: Florian Mounier aka paradoxxxzero + ++imports.gi.GIRepository.Repository.prepend_search_path('@gtop_path@'); ++imports.gi.GIRepository.Repository.prepend_search_path('@glib_net_path@'); ++ + /* Ugly. This is here so that we don't crash old libnm-glib based shells unnecessarily + * by loading the new libnm.so. Should go away eventually */ + const libnm_glib = imports.gi.GIRepository.Repository.get_default().is_registered("NMClient", "1.0"); +@@ -386,7 +389,7 @@ const smMountsMonitor = new Lang.Class({ + connected: false, + _init: function () { + this._volumeMonitor = Gio.VolumeMonitor.get(); +- let sys_mounts = ['/home', '/tmp', '/boot', '/usr', '/usr/local']; ++ let sys_mounts = ['/home', '/tmp', '/boot']; + this.base_mounts = ['/']; + sys_mounts.forEach(Lang.bind(this, function (sMount) { + if (this.is_sys_mount(sMount + '/')) { |