From 4da3c294f64b07e257c57921032ab05c1b20b096 Mon Sep 17 00:00:00 2001
From: Luke Adams <luke.adams@belljar.io>
Date: Tue, 9 Jan 2018 12:59:33 -0600
Subject: [PATCH] platformio-fhs: minor changes

---
 .../arduino/platformio/chrootenv.nix          | 25 ++++++++-----------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/arduino/platformio/chrootenv.nix b/pkgs/development/arduino/platformio/chrootenv.nix
index a3720619241..69182c3aa0d 100644
--- a/pkgs/development/arduino/platformio/chrootenv.nix
+++ b/pkgs/development/arduino/platformio/chrootenv.nix
@@ -1,18 +1,7 @@
-{ lib, buildFHSUserEnv, platformio, stdenv }:
-
-buildFHSUserEnv {
-  name = "platformio";
-
-  targetPkgs = pkgs: (with pkgs;
-    [
-      python27Packages.python
-      python27Packages.setuptools
-      python27Packages.pip
-      python27Packages.bottle
-      python27Packages.platformio
-      zlib
-    ]);
-  multiPkgs = pkgs: (with pkgs;
+{ stdenv, lib, buildFHSUserEnv
+}:
+let
+  pio-pkgs = pkgs: (with pkgs;
     [
       python27Packages.python
       python27Packages.setuptools
@@ -21,6 +10,12 @@ buildFHSUserEnv {
       python27Packages.platformio
       zlib
     ]);
+in
+buildFHSUserEnv {
+  name = "platformio";
+
+  targetPkgs = pio-pkgs;
+  multiPkgs = pio-pkgs;
 
   meta = with stdenv.lib; {
     description = "An open source ecosystem for IoT development";