diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2019-08-01 11:25:30 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2019-08-01 13:20:18 +0200 |
commit | 9d8984e5c991281234c960781e43366b69c79174 (patch) | |
tree | b337474a954befb8bb919777f91a0985df572a68 /pkgs/desktops | |
parent | 239fffc90d792b5362a20ec1a009978de7b8f91a (diff) |
gnomeExtensions.pidgin-im-integration: move from gnome3.pidgin-im-gnome-shell-extension
Diffstat (limited to 'pkgs/desktops')
-rw-r--r-- | pkgs/desktops/gnome-3/default.nix | 4 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix (renamed from pkgs/desktops/gnome-3/misc/pidgin/default.nix) | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 742babf721ac1..87b7be5bdd2f4 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -345,8 +345,6 @@ lib.makeScope pkgs.newScope (self: with self; { nautilus-python = callPackage ./misc/nautilus-python { }; - pidgin-im-gnome-shell-extension = callPackage ./misc/pidgin { }; - gtkhtml = callPackage ./misc/gtkhtml { enchant = pkgs.enchant1; }; pomodoro = callPackage ./misc/pomodoro { }; @@ -398,4 +396,6 @@ lib.makeScope pkgs.newScope (self: with self; { gtk = gtk3; gtkmm = gtkmm3; rest = librest; + + pidgin-im-gnome-shell-extension = pkgs.gnomeExtensions.pidgin-im-integration; # added 2019-08-01 }) diff --git a/pkgs/desktops/gnome-3/misc/pidgin/default.nix b/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix index c11fdfa6099ea..4bff9175deb6b 100644 --- a/pkgs/desktops/gnome-3/misc/pidgin/default.nix +++ b/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix @@ -1,13 +1,12 @@ { stdenv, fetchFromGitHub, glib }: stdenv.mkDerivation rec { + pname = "gnome-shell-extension-pidgin-im-integration"; version = "1.0.1"; - basename = "pidgin-im-gnome-shell-extension"; - name = "${basename}-${version}"; src = fetchFromGitHub { owner = "muffinmad"; - repo = "${basename}"; + repo = "pidgin-im-gnome-shell-extension"; rev = "v${version}"; sha256 = "1567s2sfqig4jw0nrn134f5vkx0yq31q044grv3xk4vpl1f3z2lr"; }; @@ -22,7 +21,7 @@ stdenv.mkDerivation rec { mkdir -p "$extensions_dir" mv *.js metadata.json dbus.xml gnome-shell-extension-pidgin.pot "$extensions_dir" - schemas_dir="$share_dir/gsettings-schemas/${name}/glib-2.0/schemas" + schemas_dir="$share_dir/gsettings-schemas/${pname}-${version}/glib-2.0/schemas" mkdir -p "$schemas_dir" mv schemas/* "$schemas_dir" # fix Emacs syntax highlighting: */ glib-compile-schemas "$schemas_dir" |