summary refs log tree commit diff
diff options
context:
space:
mode:
authorMario Rodas <marsam@users.noreply.github.com>2019-05-02 22:04:46 -0500
committerMario Rodas <marsam@users.noreply.github.com>2019-05-02 22:06:56 -0500
commit6e90393eadfda850024604082e651f02c7638600 (patch)
tree77c2962fdbd7650a8dfb8dc323953a979963f07f
parentcdf234714b6fad65ecd56da20e1cab6681772ed5 (diff)
downloadnixpkgs-6e90393eadfda850024604082e651f02c7638600.tar
nixpkgs-6e90393eadfda850024604082e651f02c7638600.tar.gz
nixpkgs-6e90393eadfda850024604082e651f02c7638600.tar.bz2
nixpkgs-6e90393eadfda850024604082e651f02c7638600.tar.lz
nixpkgs-6e90393eadfda850024604082e651f02c7638600.tar.xz
nixpkgs-6e90393eadfda850024604082e651f02c7638600.tar.zst
nixpkgs-6e90393eadfda850024604082e651f02c7638600.zip
looking-glass-client: fix build
spice-protocol removed the spice/error_codes.h header file [1], which
looking-glass-client was still using.

[1] https://gitlab.freedesktop.org/spice/spice-protocol/commit/334cef51d03134a50d85827ea3c2ebc1ebb09e1c
-rw-r--r--pkgs/applications/virtualization/looking-glass-client/default.nix11
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/applications/virtualization/looking-glass-client/default.nix b/pkgs/applications/virtualization/looking-glass-client/default.nix
index ca8e4985016..afb2088c6a6 100644
--- a/pkgs/applications/virtualization/looking-glass-client/default.nix
+++ b/pkgs/applications/virtualization/looking-glass-client/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ stdenv, fetchFromGitHub, fetchpatch
 , cmake, pkgconfig, SDL2, SDL, SDL2_ttf, openssl, spice-protocol, fontconfig
 , libX11, freefont_ttf, nettle, libconfig
 }:
@@ -21,6 +21,15 @@ stdenv.mkDerivation rec {
     libX11 freefont_ttf nettle libconfig cmake
   ];
 
+  patches = [
+    # Fix obsolete spice header usage. Remove with the next release. See https://github.com/gnif/LookingGlass/pull/126
+    (fetchpatch {
+      url = "https://github.com/gnif/LookingGlass/commit/2567447b24b28458ba0f09c766a643ad8d753255.patch";
+      sha256 = "04j2h75rpxd71szry15f31r6s0kgk96i8q9khdv9q3i2fvkf242n";
+      stripLen = 1;
+    })
+  ];
+
   enableParallelBuilding = true;
 
   sourceRoot = "source/client";