From 79635efaa5bbe85b75b76cd481d449a4d2e4f6a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 19 Mar 2025 15:23:50 +0100 Subject: [PATCH] clan-vm-manager: support basic devshell on macOS --- pkgs/clan-vm-manager/default.nix | 22 ++++++++++++++-------- pkgs/clan-vm-manager/flake-module.nix | 23 +++++++++++------------ 2 files changed, 25 insertions(+), 20 deletions(-) diff --git a/pkgs/clan-vm-manager/default.nix b/pkgs/clan-vm-manager/default.nix index 5842ef44e..85f292747 100644 --- a/pkgs/clan-vm-manager/default.nix +++ b/pkgs/clan-vm-manager/default.nix @@ -19,6 +19,8 @@ setuptools, webkitgtk_6_0, wrapGAppsHook, + lib, + stdenv, }: let source = ./.; @@ -32,14 +34,18 @@ let }; # Dependencies that are directly used in the project but nor from internal python packages - externalPythonDeps = [ - pygobject3 - pygobject-stubs - gtk4 - libadwaita - webkitgtk_6_0 - adwaita-icon-theme - ] ++ clan-cli.propagatedBuildInputs; + externalPythonDeps = + [ + pygobject3 + pygobject-stubs + gtk4 + libadwaita + adwaita-icon-theme + ] + ++ clan-cli.propagatedBuildInputs + ++ lib.optionals (!stdenv.isDarwin) [ + webkitgtk_6_0 + ]; # Deps including python packages from the local project allPythonDeps = [ (python3.pkgs.toPythonModule clan-cli) ] ++ externalPythonDeps; diff --git a/pkgs/clan-vm-manager/flake-module.nix b/pkgs/clan-vm-manager/flake-module.nix index f0b172db8..35e934922 100644 --- a/pkgs/clan-vm-manager/flake-module.nix +++ b/pkgs/clan-vm-manager/flake-module.nix @@ -8,17 +8,16 @@ system, ... }: - if lib.elem system lib.platforms.darwin then - { } - else - { - devShells.clan-vm-manager = pkgs.callPackage ./shell.nix { - inherit (config.packages) clan-vm-manager; - }; - packages.clan-vm-manager = pkgs.python3.pkgs.callPackage ./default.nix { - inherit (config.packages) clan-cli; - }; - - checks = config.packages.clan-vm-manager.tests; + { + devShells.clan-vm-manager = pkgs.callPackage ./shell.nix { + inherit (config.packages) clan-vm-manager; }; + } + // lib.optionalAttrs (system != lib.platforms.darwin) { + packages.clan-vm-manager = pkgs.python3.pkgs.callPackage ./default.nix { + inherit (config.packages) clan-cli; + }; + + checks = config.packages.clan-vm-manager.tests; + }; }