Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2f5593b3a39b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: feeda77ec2b4
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 7, 2020

  1. Copy the full SHA
    56fb786 View commit details

Commits on Nov 9, 2020

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

    looking-glass-client: B1 -> B2
    Mic92 authored Nov 9, 2020
    Copy the full SHA
    feeda77 View commit details
Showing with 13 additions and 19 deletions.
  1. +13 −19 pkgs/applications/virtualization/looking-glass-client/default.nix
32 changes: 13 additions & 19 deletions pkgs/applications/virtualization/looking-glass-client/default.nix
Original file line number Diff line number Diff line change
@@ -1,36 +1,30 @@
{ stdenv, fetchFromGitHub, fetchpatch
, cmake, pkgconfig, SDL2, SDL, SDL2_ttf, openssl, spice-protocol, fontconfig
, libX11, freefont_ttf, nettle, libconfig, wayland, libpthreadstubs, libXdmcp
, libXfixes, libbfd
{ stdenv, fetchFromGitHub, cmake, pkgconfig, SDL2, SDL2_ttf, spice-protocol
, fontconfig, libX11, freefont_ttf, nettle, libpthreadstubs, libXau, libXdmcp
, libXi, libXext, wayland, libffi, libGLU, expat, libbfd
}:

stdenv.mkDerivation rec {
pname = "looking-glass-client";
version = "B1";
version = "B2";

src = fetchFromGitHub {
owner = "gnif";
repo = "LookingGlass";
rev = version;
sha256 = "0vykv7yjz4fima9d82m83acd8ab72nq4wyzyfs1c499i27wz91ia";
sha256 = "100b5kzh8gr81kzw5fdqz2jsms25hv3815d31vy3qd6lrlm5gs3d";
fetchSubmodules = true;
};

nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ cmake pkgconfig ];

buildInputs = [
SDL SDL2 SDL2_ttf openssl spice-protocol fontconfig
libX11 freefont_ttf nettle libconfig wayland libpthreadstubs
libXdmcp libXfixes libbfd cmake
SDL2 SDL2_ttf spice-protocol fontconfig libX11 freefont_ttf nettle
libpthreadstubs libXau libXdmcp libXi libXext wayland libffi libGLU expat
libbfd
];

enableParallelBuilding = true;

sourceRoot = "source/client";

installPhase = ''
mkdir -p $out/bin
mv looking-glass-client $out/bin
'';
NIX_CFLAGS_COMPILE = "-mavx"; # Fix some sort of AVX compiler problem.

meta = with stdenv.lib; {
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
for legacy programs that require high performance graphics.
'';
homepage = "https://looking-glass.hostfission.com/";
homepage = "https://looking-glass.io/";
license = licenses.gpl2Plus;
maintainers = [ maintainers.alexbakker ];
maintainers = with maintainers; [ alexbakker ];
platforms = [ "x86_64-linux" ];
};
}