From 696206c405a830841b2256f7a0f965a135cda433 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 13 Sep 2012 10:13:16 -0400
Subject: [PATCH] Rename spiceProtocol -> spice_protocol

---
 pkgs/development/libraries/spice/default.nix | 4 ++--
 pkgs/os-specific/linux/qemu-kvm/default.nix  | 4 ++--
 pkgs/top-level/all-packages.nix              | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix
index cba5d9107837..52726f017abf 100644
--- a/pkgs/development/libraries/spice/default.nix
+++ b/pkgs/development/libraries/spice/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, pixman, celt, alsaLib, openssl
 , libXrandr, libXfixes, libXext, libXrender, libXinerama, libjpeg, zlib
-, spiceProtocol }:
+, spice_protocol }:
 
 with stdenv.lib;
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
                   libXrandr libXfixes libXrender libXext libXinerama
                 ];
 
-  buildNativeInputs = [ pkgconfig spiceProtocol ];
+  buildNativeInputs = [ pkgconfig spice_protocol ];
 
   # NIX_CFLAGS_COMPILE = "-fno-stack-protector";
 
diff --git a/pkgs/os-specific/linux/qemu-kvm/default.nix b/pkgs/os-specific/linux/qemu-kvm/default.nix
index 39b7074e2996..032a35ece263 100644
--- a/pkgs/os-specific/linux/qemu-kvm/default.nix
+++ b/pkgs/os-specific/linux/qemu-kvm/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, attr, zlib, SDL, alsaLib, pkgconfig, pciutils, libuuid, vde2
 , libjpeg, libpng, ncurses, python, glib, libaio, mesa
-, spice, spiceProtocol, spiceSupport ? false }:
+, spice, spice_protocol, spiceSupport ? false }:
 
 assert stdenv.isLinux;
 
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ attr zlib SDL alsaLib pkgconfig pciutils libuuid vde2 libjpeg libpng
       ncurses python glib libaio mesa
-    ] ++ stdenv.lib.optionals spiceSupport [ spiceProtocol spice ];
+    ] ++ stdenv.lib.optionals spiceSupport [ spice_protocol spice ];
 
   postInstall =
     ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6bf166f17f50..13de3b9996ef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4824,7 +4824,7 @@ let
     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 { };