diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-09 23:44:44 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-09 23:44:44 +0000 |
| commit | 3a83df3438b51028eca5d9322001369ac2ddd83a (patch) | |
| tree | 683ba31bca96a281d52a8c47e6e981ed6ba0ab3d /pkgs/os-specific/linux/conky/default.nix | |
| parent | 4a11f058e4fa6f07ce9ea122aead4ac0a6c6eedc (diff) | |
| download | nixlib-3a83df3438b51028eca5d9322001369ac2ddd83a.tar nixlib-3a83df3438b51028eca5d9322001369ac2ddd83a.tar.gz nixlib-3a83df3438b51028eca5d9322001369ac2ddd83a.tar.bz2 nixlib-3a83df3438b51028eca5d9322001369ac2ddd83a.tar.lz nixlib-3a83df3438b51028eca5d9322001369ac2ddd83a.tar.xz nixlib-3a83df3438b51028eca5d9322001369ac2ddd83a.tar.zst nixlib-3a83df3438b51028eca5d9322001369ac2ddd83a.zip | |
conky-1.8.1, fix FTBFS
svn path=/nixpkgs/trunk/; revision=31460
Diffstat (limited to 'pkgs/os-specific/linux/conky/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/conky/default.nix | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 29a81592c147..fda361d6c742 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -1,15 +1,19 @@ {stdenv, fetchurl, pkgconfig, libxml2, curl, wirelesstools, glib, openssl}: -stdenv.mkDerivation { - name = "conky-1.7.2"; +stdenv.mkDerivation rec { + name = "conky-1.8.1"; src = fetchurl { - url = "mirror://sourceforge/conky/conky-1.7.2.tar.bz2"; - sha256 = "0p375id2saxm2bp6c33ddn9d6rxymmq60ajlvx49smwhzyqa3h5k"; + url = "mirror://sourceforge/conky/${name}.tar.bz2"; + sha256 = "0hsybra4qzaqzny6n66m7768vbwkikajcvcbsqgnnnb9527jfnpq"; }; buildInputs = [ pkgconfig libxml2 curl wirelesstools glib openssl ]; - configureFlags = "--disable-x11 --disable-xdamage --disable-own-window --disable-xft --disable-lua --enable-mpd --enable-double-buffer --enable-proc-uptime --enable-seti --enable-wlan --enable-rss"; + configureFlags = + (map (x: "--disable-${x}") [ "x11" "xdamage" "own-window" "xft" "lua" "ncurses" ]) + ++ (map (x: "--enable-${x}") [ "mpd" "double-buffer" "wlan" "rss" ]); + + patches = [ ./curl-types-h.patch ]; meta = { homepage = http://conky.sourceforge.net/; |