From de6aa89c4506b62d9f97aa694c9e2e6ff009dc23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 9 Nov 2009 11:55:31 +0000 Subject: [PATCH] Updating xchm. svn path=/nixpkgs/trunk/; revision=18310 --- pkgs/applications/misc/xchm/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 8 ++++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/xchm/default.nix b/pkgs/applications/misc/xchm/default.nix index adbb6f371eb..b574b5fa5ec 100644 --- a/pkgs/applications/misc/xchm/default.nix +++ b/pkgs/applications/misc/xchm/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, wxGTK, chmlib}: stdenv.mkDerivation { - name = "xchm-1.9"; + name = "xchm-1.17"; src = fetchurl { - url = mirror://sourceforge/xchm/xchm-1.14.tar.gz; - sha256 = "0gx8h8iabfrawx86f3im36favwl18afwx6z7w9gkjamihcm1an1w"; + url = mirror://sourceforge/xchm/xchm-1.17.tar.gz; + sha256 = "0yizisn4833nnpd4apallyg8iv334y00hv3awbsbc0ks2zf93x0n"; }; buildInputs = [wxGTK chmlib]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 06bfa873377..378b7b770b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5775,6 +5775,11 @@ let inherit (glibc) kernelHeaders; }; + kvm88 = import ../os-specific/linux/kvm/88.nix { + inherit fetchurl stdenv zlib SDL alsaLib pkgconfig pciutils; + inherit (glibc) kernelHeaders; + }; + libcap = import ../os-specific/linux/libcap { inherit fetchurl stdenv attr; }; @@ -7847,8 +7852,7 @@ let }; xchm = import ../applications/misc/xchm { - inherit fetchurl stdenv chmlib; - wxGTK = wxGTK26; + inherit fetchurl stdenv chmlib wxGTK; }; /* Doesn't work yet