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

looking-glass-client: B2 -> B3

Browse Source
This commit is contained in:
Daniel Fullmer
2021-04-17 20:21:17 -07:00
parent 3c28fc677c
commit 26fb5f75ad
2 changed files with 59 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/virtualization/looking-glass-client/default.nix
+14 -5
View File
@@ -1,17 +1,18 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, SDL2, SDL2_ttf, spice-protocol
, fontconfig, libX11, freefont_ttf, nettle, libpthreadstubs, libXau, libXdmcp
, libXi, libXext, wayland, libffi, libGLU, expat, libbfd
, libXi, libXext, wayland, wayland-protocols, libffi, libGLU, libXScrnSaver
, expat, libbfd
}:
stdenv.mkDerivation rec {
pname = "looking-glass-client";
version = "B2";
version = "B3";
src = fetchFromGitHub {
owner = "gnif";
repo = "LookingGlass";
rev = version;
sha256 = "100b5kzh8gr81kzw5fdqz2jsms25hv3815d31vy3qd6lrlm5gs3d";
sha256 = "1vmabjzn85p0brdian9lbpjq39agzn8k0limn8zjm713lh3n3c0f";
fetchSubmodules = true;
};
@@ -19,10 +20,18 @@ stdenv.mkDerivation rec {
buildInputs = [
SDL2 SDL2_ttf spice-protocol fontconfig libX11 freefont_ttf nettle
libpthreadstubs libXau libXdmcp libXi libXext wayland libffi libGLU expat
libbfd
libpthreadstubs libXau libXdmcp libXi libXext wayland wayland-protocols
libffi libGLU libXScrnSaver expat libbfd
];
patches = [
# error: ‘h’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
# Fixed upstream in master in 8771103abbfd04da9787dea760405364af0d82de, but not in B3.
# Including our own patch here since upstream commit patch doesnt apply cleanly on B3
./0001-client-all-fix-more-maybe-uninitialized-when-O3-is-i.patch
];
patchFlags = "-p2";
sourceRoot = "source/client";
NIX_CFLAGS_COMPILE = "-mavx"; # Fix some sort of AVX compiler problem.