diff --git a/flake.lock b/flake.lock index 0b6bdf2..53e531e 100644 --- a/flake.lock +++ b/flake.lock @@ -82,16 +82,16 @@ ] }, "locked": { - "lastModified": 1724169406, - "narHash": "sha256-gwV/JQ+SqdTgZhJD4uGR2I2LL99NPTazKG+X2VOEVWk=", + "lastModified": 1736010556, + "narHash": "sha256-//oInuofX+Zrm0ZJ79nVmExK+tk35iYN8OrxDJoJY38=", "owner": "olivierldff", "repo": "qolm", - "rev": "cfbde7f855724d51106ef0913934974107c371c7", + "rev": "93def065c3ebc0cc190f717f6578bde0b8d8ee35", "type": "github" }, "original": { "owner": "olivierldff", - "ref": "v3.2.2", + "ref": "v3.2.3", "repo": "qolm", "type": "github" } diff --git a/flake.nix b/flake.nix index 27c71f1..1495225 100644 --- a/flake.nix +++ b/flake.nix @@ -12,7 +12,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; qolm = { - url = "github:olivierldff/qolm/v3.2.2"; + url = "github:olivierldff/qolm/v3.2.3"; inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-utils.follows = "flake-utils"; inputs.nix-filter.follows = "nix-filter"; @@ -38,7 +38,7 @@ ]; }; - nixglhost = nix-gl-host.packages.${system}.default; + nixglhost = if pkgs.stdenv.isLinux then nix-gl-host.packages.${system}.default else null; nativeBuildInputs = with pkgs; [ qt6.wrapQtAppsHook @@ -66,11 +66,6 @@ ++ buildInputsFontRobotoMono ++ buildInputsFontLato; - nativeCheckInputs = with pkgs; [ - dbus - xvfb-run - ]; - shellHook = '' # Crazy shell hook to set up Qt environment, from: # https://discourse.nixos.org/t/python-qt-woes/11808/12 @@ -104,7 +99,7 @@ ]; qaterial = with pkgs; stdenv.mkDerivation rec { - inherit version nativeBuildInputs buildInputs nativeCheckInputs; + inherit version nativeBuildInputs buildInputs; inherit CPM_USE_LOCAL_PACKAGES; propagatedBuildInputs = buildInputs; @@ -161,9 +156,8 @@ echo "Run shell hook" ${shellHook} - xvfb-run dbus-run-session \ - --config-file=${pkgs.dbus}/share/dbus-1/session.conf \ - ctest -C "${cmakeConfigType}" --output-on-failure --verbose + export QT_QPA_PLATFORM=offscreen + ctest -C "${cmakeConfigType}" --output-on-failure --verbose ''; installPhase = '' @@ -188,9 +182,8 @@ echo "Run shell hook" ${shellHook} - xvfb-run dbus-run-session \ - --config-file=${pkgs.dbus}/share/dbus-1/session.conf \ - find_package_build/QaterialFindPackageTest + export QT_QPA_PLATFORM=offscreen + find_package_build/QaterialFindPackageTest ''; }; @@ -211,7 +204,6 @@ gh ]; fullDevBuildInputs = with pkgs; nativeBuildInputs - ++ nativeCheckInputs ++ minimalDevBuildInputs ++ [ sccache @@ -238,7 +230,6 @@ inherit CPM_USE_LOCAL_PACKAGES; nativeBuildInputs = nativeBuildInputs - ++ nativeCheckInputs ++ minimalDevBuildInputs; }; diff --git a/nix/get-pkg-source-from-cmake.nix b/nix/get-pkg-source-from-cmake.nix index 181c2f5..5b36fd1 100644 --- a/nix/get-pkg-source-from-cmake.nix +++ b/nix/get-pkg-source-from-cmake.nix @@ -16,8 +16,7 @@ let pkg_url = elemAt parse_repo 0; pkg_hash = elemAt parse_tag 0; pkg_rev = elemAt parse_tag 1; - parse_url = match ".*github\\.com/([[:alpha:]]+)/([a-zA-Z\\.0-9-]+?)(/.*|$)" - pkg_url; + parse_url = match ".*github\\.com/([a-zA-Z]+)/([a-zA-Z\\.0-9-]+)(/.*|$)" pkg_url; pkg_owner = elemAt parse_url 0; pkg_name_with_potential_extensions = elemAt parse_url 1;