public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump virt-viewer to 0.6.0, from the 2009 version

Browse Source
This commit is contained in:
Benjamin Podszun 2014-05-10 10:37:59 +02:00 committed by Bjørn Forsman
parent 0bf388b697
commit 2ce5162252
2 changed files with 27 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
pkgs/applications/virtualization/virt-viewer/default.nix
View File

@ -1,50 +1,40 @@
x@{builderDefsPackage { stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtkvnc, gmp
, gnome, gtk, glib, libxml2, pkgconfig, libvirt, gtkvnc, cyrus_sasl, libtasn1 , libgcrypt, gnupg, cyrus_sasl, spiceSupport ? true, spice_gtk, shared_mime_info
, gnupg, libgcrypt, perl, nettle, yajl, libcap_ng , libvirt, libcap_ng, yajl
, ...}: }:
builderDefsPackage
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
["gnome"];
buildInputs = (map (n: builtins.getAttr n x) with stdenv.lib;
(builtins.attrNames (builtins.removeAttrs x helperArgNames)))
++ [gnome.libglade]; let sourceInfo = rec {
sourceInfo = rec {
baseName="virt-viewer"; baseName="virt-viewer";
version="0.2.0"; version="0.6.0";
name="${baseName}-${version}"; name="${baseName}-${version}";
url="http://virt-manager.org/download/sources/${baseName}/${name}.tar.gz"; url="http://virt-manager.org/download/sources/${baseName}/${name}.tar.gz";
hash="0lhkmp4kn0s2z8241lqf2fdi55jg9iclr5hjw3m4wzaznpiajwlp"; hash="0svalnr6k8rjadysnxixygk3bdx04asmwx75bhrbljyicba216v6";
}; }; in
in
rec { stdenv.mkDerivation {
src = a.fetchurl { inherit (sourceInfo) name version;
src = fetchurl {
url = sourceInfo.url; url = sourceInfo.url;
sha256 = sourceInfo.hash; sha256 = sourceInfo.hash;
}; };
inherit (sourceInfo) name version; buildInputs = [
inherit buildInputs; pkgconfig intltool glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl
shared_mime_info libvirt libcap_ng yajl
/* doConfigure should be removed if not needed */ ] ++ optional spiceSupport spice_gtk;
phaseNames = ["doConfigure" "doMakeInstall"];
meta = { meta = {
description = "A viewer for remote virtual machines"; description = "A viewer for remote virtual machines";
maintainers = with a.lib.maintainers; maintainers = maintainers.raskin;
[ platforms = platforms.linux;
raskin license = licenses.gpl2;
];
platforms = with a.lib.platforms;
linux;
license = a.lib.licenses.gpl2;
}; };
passthru = { passthru = {
updateInfo = { updateInfo = {
downloadPage = "http://virt-manager.org/download.html"; downloadPage = "http://virt-manager.org/download.html";
}; };
}; };
}) x }

5
pkgs/top-level/all-packages.nix
View File

@ -9500,7 +9500,10 @@ let
vimrc = config.vim.vimrc or ""; vimrc = config.vim.vimrc or "";
}; };
virtviewer = callPackage ../applications/virtualization/virt-viewer {}; virtviewer = callPackage ../applications/virtualization/virt-viewer {
gtkvnc = gtkvnc.override { enableGTK3 = true; };
spice_gtk = spice_gtk.override { enableGTK3 = true; };
};
virtmanager = callPackage ../applications/virtualization/virt-manager { virtmanager = callPackage ../applications/virtualization/virt-manager {
inherit (gnome) gnome_python; inherit (gnome) gnome_python;
vte = gnome3.vte; vte = gnome3.vte;