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

Merge pull request #66513 from alexbakker/looking-glass-client-b1 

looking-glass-client: a12 -> B1
This commit is contained in:
Marek Mahut 2019-08-18 16:20:32 +02:00 committed by GitHub
parent bcc14b2700 13d261b535
commit 17f72af38a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
maintainers/maintainer-list.nix
View File

@ -296,6 +296,11 @@
githubId = 17208985; githubId = 17208985;
name = "Alex Rice"; name = "Alex Rice";
}; };
alexbakker = {
email = "ab@alexbakker.me";
github = "alexbakker";
name = "Alexander Bakker";
};
alexchapman = { alexchapman = {
email = "alex@farfromthere.net"; email = "alex@farfromthere.net";
github = "AJChapman"; github = "AJChapman";

21
pkgs/applications/virtualization/looking-glass-client/default.nix
View File

@ -1,33 +1,26 @@
{ stdenv, fetchFromGitHub, fetchpatch { stdenv, fetchFromGitHub, fetchpatch
, cmake, pkgconfig, SDL2, SDL, SDL2_ttf, openssl, spice-protocol, fontconfig , cmake, pkgconfig, SDL2, SDL, SDL2_ttf, openssl, spice-protocol, fontconfig
, libX11, freefont_ttf, nettle, libconfig , libX11, freefont_ttf, nettle, libconfig, wayland, libpthreadstubs, libXdmcp
, libXfixes, libbfd
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "looking-glass-client-${version}"; name = "looking-glass-client-${version}";
version = "a12"; version = "B1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gnif"; owner = "gnif";
repo = "LookingGlass"; repo = "LookingGlass";
rev = version; rev = version;
sha256 = "0r6bvl9q94039r6ff4f2bg8si95axx9w8bf1h1qr5730d2kv5yxq"; sha256 = "0vykv7yjz4fima9d82m83acd8ab72nq4wyzyfs1c499i27wz91ia";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
SDL SDL2 SDL2_ttf openssl spice-protocol fontconfig SDL SDL2 SDL2_ttf openssl spice-protocol fontconfig
libX11 freefont_ttf nettle libconfig cmake libX11 freefont_ttf nettle libconfig wayland libpthreadstubs
]; libXdmcp libXfixes libbfd 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; enableParallelBuilding = true;
@ -50,7 +43,7 @@ stdenv.mkDerivation rec {
''; '';
homepage = https://looking-glass.hostfission.com/; homepage = https://looking-glass.hostfission.com/;
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = [ maintainers.pneumaticat ]; maintainers = [ maintainers.alexbakker ];
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
}; };
} }