From 0ac4e0f0083fa8e94617d4345eb757702282adf2 Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 12 Sep 2024 14:44:39 +0100 Subject: [PATCH] picocom: move to `pkgs/by-name` --- .../picocom/default.nix => by-name/pi/picocom/package.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/{tools/misc/picocom/default.nix => by-name/pi/picocom/package.nix} (92%) diff --git a/pkgs/tools/misc/picocom/default.nix b/pkgs/by-name/pi/picocom/package.nix similarity index 92% rename from pkgs/tools/misc/picocom/default.nix rename to pkgs/by-name/pi/picocom/package.nix index d8422e3679fd..10fc1d7bfa0b 100644 --- a/pkgs/tools/misc/picocom/default.nix +++ b/pkgs/by-name/pi/picocom/package.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , installShellFiles , lrzsz -, IOKit +, darwin }: stdenv.mkDerivation rec { @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optional stdenv.isDarwin IOKit; + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; installPhase = '' install -Dm555 -t $out/bin picocom diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c12c64eac07b..5e4cca8e28b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32589,10 +32589,6 @@ with pkgs; picard = callPackage ../applications/audio/picard { }; - picocom = callPackage ../tools/misc/picocom { - inherit (darwin.apple_sdk.frameworks) IOKit; - }; - picoloop = callPackage ../applications/audio/picoloop { }; picosnitch = callPackage ../tools/networking/picosnitch { };