diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index 52726f017ab..fc2e5bb72c5 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -1,27 +1,28 @@ { stdenv, fetchurl, pkgconfig, pixman, celt, alsaLib, openssl , libXrandr, libXfixes, libXext, libXrender, libXinerama, libjpeg, zlib -, spice_protocol }: +, spice_protocol, python, pyparsing }: with stdenv.lib; stdenv.mkDerivation rec { - name = "spice-0.10.1"; + name = "spice-0.12.0"; src = fetchurl { url = "http://www.spice-space.org/download/releases/${name}.tar.bz2"; - sha256 = "105p5fh6hhhzvz0fh1x52lzi41rpvajf390xbbw3da4417lf5pqk"; + sha256 = "15mp6nz467h4l5jg3vk51si6r5w7g329jvsy61f2gl3yabwcxmva"; }; buildInputs = [ pixman celt alsaLib openssl libjpeg zlib libXrandr libXfixes libXrender libXext libXinerama - ]; + python pyparsing ]; buildNativeInputs = [ pkgconfig spice_protocol ]; - # NIX_CFLAGS_COMPILE = "-fno-stack-protector"; + NIX_CFLAGS_COMPILE = "-fno-stack-protector"; configureFlags = [ "--with-sasl=no" + "--disable-smartcard" ]; postInstall = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c950cc3f164..5dba3d20194 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4883,6 +4883,7 @@ let spice = callPackage ../development/libraries/spice { celt = celt_0_5_1; inherit (xlibs) libXrandr libXfixes libXext libXrender libXinerama; + inherit (pythonPackages) pyparsing; }; spice_protocol = callPackage ../development/libraries/spice-protocol { };