git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #92000 from f4814/platformio-udev

platformio: Add udev rules to package output

commit0057be6ebcb3fa1e80cf66e2167f5a82346983b2 authorFlorian Klink <flokli@flokli.de> dateSat 11 Jul 2020, 14:10 (6 years ago) parent785b5585ed47f3
3 files changed+27−1
pkgs/development/arduino/platformio/chrootenv.nix+12−1 pkgs/development/arduino/platformio/core.nix+1 pkgs/development/arduino/platformio/missing-udev-rules-nixos.patch+14
pkgs/development/arduino/platformio/chrootenv.nix+12−1
@@ -1,4 +1,4 @@
1−{ lib, buildFHSUserEnv }:
1+{ lib, buildFHSUserEnv, fetchFromGitHub }:
22
33let
44 pio-pkgs = pkgs:
@@ -19,6 +19,14 @@ let
1919 platformio
2020 ]);
2121
22+ src = fetchFromGitHub {
23+ owner = "platformio";
24+ repo = "platformio-core";
25+ rev = "v4.3.4";
26+ sha256 = "0vf2j79319ypr4yrdmx84853igkb188sjfvlxgw06rlsvsm3kacq";
27+ };
28+
29+
2230in buildFHSUserEnv {
2331 name = "platformio";
2432
@@ -34,7 +42,10 @@ in buildFHSUserEnv {
3442 };
3543
3644 extraInstallCommands = ''
45+ mkdir -p $out/lib/udev/rules.d
46+
3747 ln -s $out/bin/platformio $out/bin/pio
48+ ln -s ${src}/scripts/99-platformio-udev.rules $out/lib/udev/rules.d/99-platformio-udev.rules
3849 '';
3950
4051 runScript = "platformio";
pkgs/development/arduino/platformio/core.nix+1
@@ -82,6 +82,7 @@ in buildPythonApplication rec {
8282 patches = [
8383 ./fix-searchpath.patch
8484 ./use-local-spdx-license-list.patch
85+ ./missing-udev-rules-nixos.patch
8586 ];
8687
8788 postPatch = ''
pkgs/development/arduino/platformio/missing-udev-rules-nixos.patchnew file+14
@@ -0,0 +1,14 @@
1+diff --git a/platformio/exception.py b/platformio/exception.py
2+index d291ad7f..4761a35b 100644
3+--- a/platformio/exception.py
4++++ b/platformio/exception.py
5+@@ -195,7 +195,8 @@ class MissedUdevRules(InvalidUdevRules):
6+
7+ MESSAGE = (
8+ "Warning! Please install `99-platformio-udev.rules`. \nMode details: "
9+- "https://docs.platformio.org/en/latest/faq.html#platformio-udev-rules"
10++ "https://docs.platformio.org/en/latest/faq.html#platformio-udev-rules\n"
11++ "On NixOS add the platformio package to services.udev.packages"
12+ )
13+
14+