summary refs log tree commit diff
path: root/pkgs/os-specific/linux
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2011-05-13 12:10:33 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2011-05-13 12:10:33 +0000
commitf0295b47712f0687cb737b8134fe6cdf7038ef61 (patch)
treef0df190388019d5ddd5389fec015735915387fa5 /pkgs/os-specific/linux
parent22377172b20fa32fe3a44d84b40cb7046861debe (diff)
downloadnixlib-f0295b47712f0687cb737b8134fe6cdf7038ef61.tar
nixlib-f0295b47712f0687cb737b8134fe6cdf7038ef61.tar.gz
nixlib-f0295b47712f0687cb737b8134fe6cdf7038ef61.tar.bz2
nixlib-f0295b47712f0687cb737b8134fe6cdf7038ef61.tar.lz
nixlib-f0295b47712f0687cb737b8134fe6cdf7038ef61.tar.xz
nixlib-f0295b47712f0687cb737b8134fe6cdf7038ef61.tar.zst
nixlib-f0295b47712f0687cb737b8134fe6cdf7038ef61.zip
* Enable JPEG and PNG support in qemu-kvm's VNC implementation.
svn path=/nixpkgs/trunk/; revision=27243
Diffstat (limited to 'pkgs/os-specific/linux')
-rw-r--r--pkgs/os-specific/linux/qemu-kvm/default.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/qemu-kvm/default.nix b/pkgs/os-specific/linux/qemu-kvm/default.nix
index 92ebe93eebe9..9778d48808df 100644
--- a/pkgs/os-specific/linux/qemu-kvm/default.nix
+++ b/pkgs/os-specific/linux/qemu-kvm/default.nix
@@ -1,10 +1,11 @@
-{ stdenv, fetchurl, zlib, SDL, alsaLib, pkgconfig, pciutils, libuuid, vde2 }:
+{ stdenv, fetchurl, zlib, SDL, alsaLib, pkgconfig, pciutils, libuuid, vde2
+, libjpeg, libpng }:
    
 assert stdenv.isLinux;
    
 stdenv.mkDerivation rec {
   name = "qemu-kvm-0.14.0";
-   
+
   src = fetchurl {
     url = "mirror://sourceforge/kvm/${name}.tar.gz";
     sha256 = "0d86bj1sipg9br8xks9527cjc482gf9813h8rm690yswcprsyqig";
@@ -12,7 +13,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./smb-tmpdir.patch ];
 
-  buildInputs = [ zlib SDL alsaLib pkgconfig pciutils libuuid vde2 ];
+  buildInputs = [ zlib SDL alsaLib pkgconfig pciutils libuuid vde2 libjpeg libpng ];
 
   preBuild =
     ''