diff --git a/pkgs/applications/virtualization/looking-glass-client/default.nix b/pkgs/applications/virtualization/looking-glass-client/default.nix index 67baa3ab91bd..bd45e4ebff4e 100644 --- a/pkgs/applications/virtualization/looking-glass-client/default.nix +++ b/pkgs/applications/virtualization/looking-glass-client/default.nix @@ -22,6 +22,7 @@ , libXinerama , libXcursor , libXpresent +, libXdmcp , wayland , wayland-protocols @@ -30,6 +31,7 @@ , pulseaudio , libsamplerate +, openGLSupport ? false , xorgSupport ? true , waylandSupport ? true , pipewireSupport ? true @@ -43,35 +45,35 @@ let type = "Application"; exec = "looking-glass-client"; icon = "lg-logo"; - terminal = true; }; in stdenv.mkDerivation rec { pname = "looking-glass-client"; - version = "B6"; + version = "B7-rc1"; src = fetchFromGitHub { owner = "gnif"; repo = "LookingGlass"; rev = version; - sha256 = "sha256-6vYbNmNJBCoU23nVculac24tHqH7F4AZVftIjL93WJU="; + sha256 = "sha256-ne1Q+67+P8RHcTsqdiSSwkFf0g3pSNT91WN/lsSzssU="; fetchSubmodules = true; }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libGL libX11 freefont_ttf spice-protocol expat libbfd nettle fontconfig libffi ] - ++ lib.optionals xorgSupport [ libxkbcommon libXi libXScrnSaver libXinerama libXcursor libXpresent libXext libXrandr ] + buildInputs = [ libGL freefont_ttf spice-protocol expat libbfd nettle fontconfig libffi ] + ++ lib.optionals xorgSupport [ libX11 libxkbcommon libXi libXScrnSaver libXinerama libXcursor libXpresent libXext libXrandr libXdmcp ] ++ lib.optionals waylandSupport [ libxkbcommon wayland wayland-protocols ] ++ lib.optionals pipewireSupport [ pipewire libsamplerate ] ++ lib.optionals pulseSupport [ pulseaudio libsamplerate ]; cmakeFlags = [ "-DOPTIMIZE_FOR_NATIVE=OFF" ] - ++ lib.optional (!xorgSupport) "-DENABLE_X11=no" - ++ lib.optional (!waylandSupport) "-DENABLE_WAYLAND=no" - ++ lib.optional (!pulseSupport) "-DENABLE_PULSEAUDIO=no" - ++ lib.optional (!pipewireSupport) "-DENABLE_PIPEWIRE=no"; - + ++ lib.optionals (!openGLSupport) [ "-DENABLE_OPENGL=no" ] + ++ lib.optionals (!xorgSupport) [ "-DENABLE_X11=no" ] + ++ lib.optionals (!waylandSupport) [ "-DENABLE_WAYLAND=no" ] + ++ lib.optionals (waylandSupport) [ "-DENABLE_WAYLAND=yes" ] + ++ lib.optionals (!pulseSupport) [ "-DENABLE_PULSEAUDIO=no" ] + ++ lib.optionals (!pipewireSupport) [ "-DENABLE_PIPEWIRE=no" ]; postUnpack = '' echo ${src.rev} > source/VERSION