looking-glass-client: B6 -> B7-rc1

j-brn b1f23d40 954aa030

+12 -10
+12 -10
pkgs/applications/virtualization/looking-glass-client/default.nix
··· 22 22 , libXinerama 23 23 , libXcursor 24 24 , libXpresent 25 + , libXdmcp 25 26 26 27 , wayland 27 28 , wayland-protocols ··· 30 31 , pulseaudio 31 32 , libsamplerate 32 33 34 + , openGLSupport ? false 33 35 , xorgSupport ? true 34 36 , waylandSupport ? true 35 37 , pipewireSupport ? true ··· 43 45 type = "Application"; 44 46 exec = "looking-glass-client"; 45 47 icon = "lg-logo"; 46 - terminal = true; 47 48 }; 48 49 in 49 50 stdenv.mkDerivation rec { 50 51 pname = "looking-glass-client"; 51 - version = "B6"; 52 + version = "B7-rc1"; 52 53 53 54 src = fetchFromGitHub { 54 55 owner = "gnif"; 55 56 repo = "LookingGlass"; 56 57 rev = version; 57 - sha256 = "sha256-6vYbNmNJBCoU23nVculac24tHqH7F4AZVftIjL93WJU="; 58 + sha256 = "sha256-ne1Q+67+P8RHcTsqdiSSwkFf0g3pSNT91WN/lsSzssU="; 58 59 fetchSubmodules = true; 59 60 }; 60 61 61 62 nativeBuildInputs = [ cmake pkg-config ]; 62 63 63 - buildInputs = [ libGL libX11 freefont_ttf spice-protocol expat libbfd nettle fontconfig libffi ] 64 - ++ lib.optionals xorgSupport [ libxkbcommon libXi libXScrnSaver libXinerama libXcursor libXpresent libXext libXrandr ] 64 + buildInputs = [ libGL freefont_ttf spice-protocol expat libbfd nettle fontconfig libffi ] 65 + ++ lib.optionals xorgSupport [ libX11 libxkbcommon libXi libXScrnSaver libXinerama libXcursor libXpresent libXext libXrandr libXdmcp ] 65 66 ++ lib.optionals waylandSupport [ libxkbcommon wayland wayland-protocols ] 66 67 ++ lib.optionals pipewireSupport [ pipewire libsamplerate ] 67 68 ++ lib.optionals pulseSupport [ pulseaudio libsamplerate ]; 68 69 69 70 cmakeFlags = [ "-DOPTIMIZE_FOR_NATIVE=OFF" ] 70 - ++ lib.optional (!xorgSupport) "-DENABLE_X11=no" 71 - ++ lib.optional (!waylandSupport) "-DENABLE_WAYLAND=no" 72 - ++ lib.optional (!pulseSupport) "-DENABLE_PULSEAUDIO=no" 73 - ++ lib.optional (!pipewireSupport) "-DENABLE_PIPEWIRE=no"; 74 - 71 + ++ lib.optionals (!openGLSupport) [ "-DENABLE_OPENGL=no" ] 72 + ++ lib.optionals (!xorgSupport) [ "-DENABLE_X11=no" ] 73 + ++ lib.optionals (!waylandSupport) [ "-DENABLE_WAYLAND=no" ] 74 + ++ lib.optionals (waylandSupport) [ "-DENABLE_WAYLAND=yes" ] 75 + ++ lib.optionals (!pulseSupport) [ "-DENABLE_PULSEAUDIO=no" ] 76 + ++ lib.optionals (!pipewireSupport) [ "-DENABLE_PIPEWIRE=no" ]; 75 77 76 78 postUnpack = '' 77 79 echo ${src.rev} > source/VERSION