Update librepods to version 0.2.0-alpha.2 and adjust GitHub source reference

README.md

@@ -6,6 +6,8 @@ Personal [NUR](https://github.com/nix-community/NUR) repository.
 
 - **librepods**: LibrePods Linux app (Qt6) — AirPods controls and battery monitoring.
   - Upstream: `https://github.com/kavishdevar/librepods`
+- **looking-glass-client**: Looking Glass client.
+  - Upstream: `https://github.com/gnif/LookingGlass`
 
 ## Usage
 

default.nix

@@ -17,6 +17,7 @@
   # example-package = pkgs.callPackage ./pkgs/example-package { };
   librepods = pkgs.callPackage ./pkgs/librepods { };
   flow-browser-bin = pkgs.callPackage ./pkgs/flow-browser-bin { };
+  looking-glass-client = pkgs.callPackage ./pkgs/looking-glass-client { };
   # some-qt5-package = pkgs.libsForQt5.callPackage ./pkgs/some-qt5-package { };
   # ...
 }

pkgs/flow-browser-bin/default.nix

@@ -3,6 +3,7 @@
 , fetchurl
 , runCommand
 , stdenv
+, mesa
 , vips
 }:
 
@@ -18,8 +19,17 @@ let
     mkdir -p $out/lib
     # Link to the SONAME symlinks provided by nixpkgs, so we don't hardcode the
     # 42.x.y patchlevel.
-    ln -s ${vips.out}/lib/libvips-cpp.so.42 $out/lib/libvips-cpp.so.${vips.version}
+    ln -sf ${vips.out}/lib/libvips-cpp.so.42 $out/lib/libvips-cpp.so.8
-    ln -s ${vips.out}/lib/libvips.so.42 $out/lib/libvips.so.${vips.version}
+    ln -sf ${vips.out}/lib/libvips.so.42 $out/lib/libvips.so.8
+
+    # `sharp` wants an exact libvips filename including patchlevel (observed in
+    # Flow 0.8.6: libvips-cpp.so.8.17.3). Provide a small compatibility set:
+    # - the version bundled with Flow (`8.17.3`)
+    # - the current nixpkgs vips.version (helps when they match)
+    for v in 8.17.3 ${vips.version}; do
+      ln -sf ${vips.out}/lib/libvips-cpp.so.42 $out/lib/libvips-cpp.so.$v
+      ln -sf ${vips.out}/lib/libvips.so.42 $out/lib/libvips.so.$v
+    done
   '';
 
   src =
@@ -43,12 +53,19 @@ in
 appimageTools.wrapType2 {
   inherit pname version src;
 
-  extraPkgs = pkgs: [ vipsSharpCompat ];
+  extraPkgs = _pkgs: [
+    vipsSharpCompat
+    mesa
+  ];
 
   # Ensure `sharp` can find libvips in the bubblewrapped FHS env.
   # (Relying on /usr/lib64 + ld.so cache can be flaky depending on the env.)
   profile = ''
     export LD_LIBRARY_PATH="${vipsSharpCompat}/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
+
+    # Help Electron/ANGLE find GL/EGL drivers inside the FHS env.
+    export LIBGL_DRIVERS_PATH="${mesa}/lib/dri"
+    export __EGL_VENDOR_LIBRARY_DIRS="${mesa}/share/glvnd/egl_vendor.d''${__EGL_VENDOR_LIBRARY_DIRS:+:}$__EGL_VENDOR_LIBRARY_DIRS"
   '';
 
   extraInstallCommands = ''
@@ -57,7 +74,27 @@ appimageTools.wrapType2 {
       $out/share/applications/flow-browser.desktop
 
     substituteInPlace $out/share/applications/flow-browser.desktop \
-      --replace-fail 'Exec=AppRun' 'Exec=${pname}'
+      --replace-fail 'Exec=AppRun' "Exec=$out/bin/${pname}"
+
+    # Help launchers detect the binary without relying on PATH.
+    if grep -q '^TryExec=' $out/share/applications/flow-browser.desktop; then
+      sed -i "s|^TryExec=.*|TryExec=$out/bin/${pname}|" $out/share/applications/flow-browser.desktop
+    else
+      echo "TryExec=$out/bin/${pname}" >> $out/share/applications/flow-browser.desktop
+    fi
+
+    # appimageTools.wrapType2 tends to name the wrapper with the version suffix
+    # (e.g. flow-browser-bin-0.8.6). Provide a stable name for launchers/scripts.
+    if [ -e "$out/bin/${pname}-${version}" ] && [ ! -e "$out/bin/${pname}" ]; then
+      ln -s "$out/bin/${pname}-${version}" "$out/bin/${pname}"
+    fi
+
+    # Keep the launcher name stable (avoid showing version suffixes in menus).
+    if grep -q '^Name=' $out/share/applications/flow-browser.desktop; then
+      sed -i 's/^Name=.*/Name=Flow/' $out/share/applications/flow-browser.desktop
+    else
+      echo 'Name=Flow' >> $out/share/applications/flow-browser.desktop
+    fi
 
     # Icon
     install -D -m 444 ${appimageContents}/usr/share/icons/hicolor/512x512/apps/Flow.png \

pkgs/librepods/default.nix

@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "librepods";
-  version = "0.1.0";
+  version = "0.2.0-alpha.2";
 
   src = fetchFromGitHub {
     owner = "kavishdevar";
     repo = "librepods";
-    rev = "linux-v${version}";
+    rev = "v${version}";
-    hash = "sha256-ZvHbSSW0rfcsNUORZURe0oBHQbnqmS5XT9ffVMwjIMU=";
+    hash = "sha256-37dLiXC+eO4f5waLKgMMpHXH1m6W54O/l2axJsnyU5M=";
   };
 
   sourceRoot = "${src.name}/linux";

pkgs/looking-glass-client/default.nix

@@ -0,0 +1,140 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  pkg-config,
+  cmake,
+  freefont_ttf,
+  spice-protocol,
+  nettle,
+  libbfd,
+  fontconfig,
+  libffi,
+  expat,
+  libGL,
+  nanosvg,
+  libX11,
+  libxkbcommon,
+  libXext,
+  libXrandr,
+  libXi,
+  libXScrnSaver,
+  libXinerama,
+  libXcursor,
+  libXpresent,
+  libXdmcp,
+  wayland,
+  wayland-protocols,
+  wayland-scanner,
+  pipewire,
+  pulseaudio,
+  libsamplerate,
+  openGLSupport ? true,
+  xorgSupport ? true,
+  waylandSupport ? true,
+  pipewireSupport ? true,
+  pulseSupport ? true,
+  rev ? "27fe47cb",
+  hash ? "sha256-I84oVLeS63mnR19vTalgvLvA5RzCPTXV+tSsw+ImDwQ=",
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "looking-glass-client";
+  version = rev;
+
+  src = fetchFromGitHub {
+    owner = "gnif";
+    repo = "LookingGlass";
+    rev = rev;
+    hash = hash;
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    wayland-scanner
+  ];
+
+  buildInputs =
+    [
+      libX11
+      libGL
+      freefont_ttf
+      spice-protocol
+      expat
+      libbfd
+      nettle
+      fontconfig
+      libffi
+      nanosvg
+    ]
+    ++ lib.optionals xorgSupport [
+      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.optionals (!openGLSupport) ["-DENABLE_OPENGL=no"]
+    ++ lib.optionals (!xorgSupport) ["-DENABLE_X11=no"]
+    ++ lib.optionals (!waylandSupport) ["-DENABLE_WAYLAND=no"]
+    ++ lib.optionals (!pulseSupport) ["-DENABLE_PULSEAUDIO=no"]
+    ++ lib.optionals (!pipewireSupport) ["-DENABLE_PIPEWIRE=no"];
+
+  # GCC can warn about maybe-uninitialized inside vendored nanosvg and Looking
+  # Glass treats warnings as errors, which breaks the build.
+  NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [
+    "-Wno-error=maybe-uninitialized"
+  ];
+
+  postUnpack = ''
+    echo ${finalAttrs.src.rev} > source/VERSION
+    export sourceRoot="source/client"
+  '';
+
+  postInstall = ''
+    mkdir -p $out/share/pixmaps
+    cp $src/resources/lg-logo.png $out/share/pixmaps
+  '';
+
+  meta = with lib; {
+    description = "KVM Frame Relay (KVMFR) implementation";
+    longDescription = ''
+      Looking Glass is an open source application that allows the use of a KVM
+      (Kernel-based Virtual Machine) configured for VGA PCI Pass-through
+      without an attached physical monitor, keyboard or mouse. This is the final
+      step required to move away from dual booting with other operating systems
+      for legacy programs that require high performance graphics.
+    '';
+    homepage = "https://looking-glass.io/";
+    downloadPage = "https://github.com/gnif/LookingGlass/releases";
+    changelog = "https://github.com/gnif/LookingGlass/commits/${rev}";
+    branch = "master";
+    license = licenses.gpl2Plus;
+    sourceProvenance = with sourceTypes; [ fromSource ];
+    mainProgram = "looking-glass-client";
+    platforms = platforms.linux;
+  };
+})