From e6d8a83407dd703becc6033dc0763251213d9040 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 21 Dec 2018 22:07:48 +0100 Subject: [PATCH] =?UTF-8?q?pidgin-skypeweb:=201.2.2=20=E2=86=92=201.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pidgin-plugins/pidgin-skypeweb/default.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix index 6e589febe6d9..5fbf385ed07b 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pidgin-skypeweb-${version}"; - version = "1.2.2"; + version = "1.5"; src = fetchFromGitHub { owner = "EionRobb"; repo = "skype4pidgin"; - rev = "${version}"; - sha256 = "1lxpz316jmns6i143v4j6sd6k0a4a54alw08rvwjckf2rig57lj2"; + rev = version; + sha256 = "1bd9gd36yhrbrww0dvai9rnzxxj1c9sb4003c72wg27w12y47xfv"; }; setSourceRoot = '' @@ -18,13 +18,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ pidgin json-glib ]; - makeFlags = [ - "PLUGIN_DIR_PURPLE=/lib/pidgin/" - "DATA_ROOT_DIR_PURPLE=/share" - "DESTDIR=$(out)" - ]; - - postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-skypeweb"; + PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2"; + PKG_CONFIG_PURPLE_DATADIR = "${placeholder "out"}/share"; meta = with stdenv.lib; { homepage = https://github.com/EionRobb/skype4pidgin;