b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #166366 from thefloweringash/expose-platformio-core

Browse source 
platformio-core: expose unwrapped platformio as platformio-core
This commit is contained in:
adisbladis 2023-04-01 19:00:03 +13:00 committed by GitHub
parent fa1b3bafc2 119a521977
commit bfeebd18d9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/development/embedded/platformio/chrootenv.nix
View file

@ -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

4
pkgs/development/embedded/platformio/default.nix
View file

@ -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; };
};

3
pkgs/top-level/all-packages.nix
View file

@ -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 { };