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

Rename spiceProtocol -> spice_protocol

This commit is contained in:
Eelco Dolstra 2012-09-13 10:13:16 -04:00
parent e12c0dbace
commit 696206c405
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/spice/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, pixman, celt, alsaLib, openssl { stdenv, fetchurl, pkgconfig, pixman, celt, alsaLib, openssl
, libXrandr, libXfixes, libXext, libXrender, libXinerama, libjpeg, zlib , libXrandr, libXfixes, libXext, libXrender, libXinerama, libjpeg, zlib
, spiceProtocol }: , spice_protocol }:
with stdenv.lib; with stdenv.lib;
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
libXrandr libXfixes libXrender libXext libXinerama libXrandr libXfixes libXrender libXext libXinerama
]; ];
buildNativeInputs = [ pkgconfig spiceProtocol ]; buildNativeInputs = [ pkgconfig spice_protocol ];
# NIX_CFLAGS_COMPILE = "-fno-stack-protector"; # NIX_CFLAGS_COMPILE = "-fno-stack-protector";

4
pkgs/os-specific/linux/qemu-kvm/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, attr, zlib, SDL, alsaLib, pkgconfig, pciutils, libuuid, vde2 { stdenv, fetchurl, attr, zlib, SDL, alsaLib, pkgconfig, pciutils, libuuid, vde2
, libjpeg, libpng, ncurses, python, glib, libaio, mesa , libjpeg, libpng, ncurses, python, glib, libaio, mesa
, spice, spiceProtocol, spiceSupport ? false }: , spice, spice_protocol, spiceSupport ? false }:
assert stdenv.isLinux; assert stdenv.isLinux;
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ attr zlib SDL alsaLib pkgconfig pciutils libuuid vde2 libjpeg libpng [ attr zlib SDL alsaLib pkgconfig pciutils libuuid vde2 libjpeg libpng
ncurses python glib libaio mesa ncurses python glib libaio mesa
] ++ stdenv.lib.optionals spiceSupport [ spiceProtocol spice ]; ] ++ stdenv.lib.optionals spiceSupport [ spice_protocol spice ];
postInstall = postInstall =
'' ''

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

@ -4824,7 +4824,7 @@ let
inherit (xlibs) libXrandr libXfixes libXext libXrender libXinerama; inherit (xlibs) libXrandr libXfixes libXext libXrender libXinerama;
}; };
spiceProtocol = callPackage ../development/libraries/spice-protocol { }; spice_protocol = callPackage ../development/libraries/spice-protocol { };
sratom = callPackage ../development/libraries/audio/sratom { }; sratom = callPackage ../development/libraries/audio/sratom { };