diff --git a/pkgs/development/embedded/platformio/chrootenv.nix b/pkgs/development/embedded/platformio/chrootenv.nix index 40aa42337413..9e84a8d6ba45 100644 --- a/pkgs/development/embedded/platformio/chrootenv.nix +++ b/pkgs/development/embedded/platformio/chrootenv.nix @@ -4,9 +4,9 @@ let pio-pkgs = pkgs: let python = pkgs.python3; - platformio = python.pkgs.callPackage ./core.nix { inherit version src; }; in (with pkgs; [ + platformio-core zlib git xdg-user-dirs @@ -15,7 +15,6 @@ let setuptools pip bottle - platformio ]); in diff --git a/pkgs/development/embedded/platformio/default.nix b/pkgs/development/embedded/platformio/default.nix index 6fd8592a12cf..fbcce7eae60e 100644 --- a/pkgs/development/embedded/platformio/default.nix +++ b/pkgs/development/embedded/platformio/default.nix @@ -1,4 +1,4 @@ -{ newScope, fetchFromGitHub }: +{ newScope, fetchFromGitHub, python3Packages }: let callPackage = newScope self; @@ -14,6 +14,8 @@ let }; self = { + platformio-core = python3Packages.callPackage ./core.nix { inherit version src; }; + platformio-chrootenv = callPackage ./chrootenv.nix { inherit version src; }; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fca8efb5b8fc..8239fa321e89 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11105,7 +11105,8 @@ with pkgs; }; platformioPackages = dontRecurseIntoAttrs (callPackage ../development/embedded/platformio { }); - platformio = platformioPackages.platformio-chrootenv; + platformio = if stdenv.isLinux then platformioPackages.platformio-chrootenv else platformioPackages.platformio-core; + platformio-core = platformioPackages.platformio-core; platinum-searcher = callPackage ../tools/text/platinum-searcher { };