Merge pull request #101820 from Chiiruno/dev/looking-glass

looking-glass-client: B1 -> B2
This commit is contained in:
Jörg Thalheim 2020-11-09 14:43:27 +01:00 committed by GitHub
commit feeda77ec2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,36 +1,30 @@
{ stdenv, fetchFromGitHub, fetchpatch { stdenv, fetchFromGitHub, cmake, pkgconfig, SDL2, SDL2_ttf, spice-protocol
, cmake, pkgconfig, SDL2, SDL, SDL2_ttf, openssl, spice-protocol, fontconfig , fontconfig, libX11, freefont_ttf, nettle, libpthreadstubs, libXau, libXdmcp
, libX11, freefont_ttf, nettle, libconfig, wayland, libpthreadstubs, libXdmcp , libXi, libXext, wayland, libffi, libGLU, expat, libbfd
, libXfixes, libbfd
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "looking-glass-client"; pname = "looking-glass-client";
version = "B1"; version = "B2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gnif"; owner = "gnif";
repo = "LookingGlass"; repo = "LookingGlass";
rev = version; rev = version;
sha256 = "0vykv7yjz4fima9d82m83acd8ab72nq4wyzyfs1c499i27wz91ia"; sha256 = "100b5kzh8gr81kzw5fdqz2jsms25hv3815d31vy3qd6lrlm5gs3d";
fetchSubmodules = true;
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ buildInputs = [
SDL SDL2 SDL2_ttf openssl spice-protocol fontconfig SDL2 SDL2_ttf spice-protocol fontconfig libX11 freefont_ttf nettle
libX11 freefont_ttf nettle libconfig wayland libpthreadstubs libpthreadstubs libXau libXdmcp libXi libXext wayland libffi libGLU expat
libXdmcp libXfixes libbfd cmake libbfd
]; ];
enableParallelBuilding = true;
sourceRoot = "source/client"; sourceRoot = "source/client";
NIX_CFLAGS_COMPILE = "-mavx"; # Fix some sort of AVX compiler problem.
installPhase = ''
mkdir -p $out/bin
mv looking-glass-client $out/bin
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A KVM Frame Relay (KVMFR) implementation"; description = "A KVM Frame Relay (KVMFR) implementation";
@ -41,9 +35,9 @@ stdenv.mkDerivation rec {
step required to move away from dual booting with other operating systems step required to move away from dual booting with other operating systems
for legacy programs that require high performance graphics. for legacy programs that require high performance graphics.
''; '';
homepage = "https://looking-glass.hostfission.com/"; homepage = "https://looking-glass.io/";
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = [ maintainers.alexbakker ]; maintainers = with maintainers; [ alexbakker ];
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
}; };
} }