From 12cc79f8449f52eacc7f9be2e3ca41dc9ea3ef03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 7 Aug 2013 14:08:05 +0200 Subject: [PATCH] dunst: upgrade to git version to fix 100% CPU problems --- pkgs/applications/misc/dunst/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index 1eb0949aeb4..cb594e494db 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -1,15 +1,18 @@ -{ stdenv, fetchurl, coreutils , unzip, which, pkgconfig , dbus +{ stdenv, fetchgit, coreutils , unzip, which, pkgconfig , dbus , freetype, xdg_utils , libXext, glib, pango , cairo, libX11, libnotify , libxdg_basedir , libXScrnSaver, xproto, libXinerama , perl, gdk_pixbuf }: stdenv.mkDerivation rec { - version = "1.0.0"; - name = "dunst-${version}"; + rev = "6a3a855b48a3db64821d1cf8a91c5ee2815a2b2d"; + name = "dunst-${rev}"; - src = fetchurl { - url = "https://github.com/knopwob/dunst/archive/v${version}.zip"; - sha256 = "1x6k6jrf219v8hmhqhnnfjycldvsnp7ag8a2y8adp5rhfmgyn671"; + # 1.0.0 release doesn't include 100% CPU fix + # https://github.com/knopwob/dunst/issues/98 + src = fetchgit { + inherit rev; + url = "https://github.com/knopwob/dunst.git"; + sha256 = "0m7yki16d72xm9n2m2fjszd8phqpn5b95q894cz75pmd0sv1j6bj"; }; patchPhase = '' @@ -23,7 +26,7 @@ stdenv.mkDerivation rec { libXScrnSaver xproto libXinerama perl]; buildPhase = '' - export VERSION=${version}; + export VERSION=${rev}; export PREFIX=$out; make dunst; '';