From d8e45aef2aa4b9217ead6dcdb9b67bbf76373f44 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 11 Dec 2022 22:20:37 -0300 Subject: [PATCH] plan9port: incorporate darwin into its expression --- pkgs/tools/system/plan9port/default.nix | 6 +++++- pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index b4a277eeec4e..b1f963e807f0 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -1,10 +1,14 @@ { lib, stdenv, fetchFromGitHub , fontconfig, freetype, libX11, libXext, libXt, xorgproto -, Carbon, Cocoa, IOKit, Metal, QuartzCore, DarwinTools , perl # For building web manuals , which, ed +, darwin }: +let + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa IOKit Metal QuartzCore; + inherit (darwin) DarwinTools; +in stdenv.mkDerivation rec { pname = "plan9port"; version = "2022-09-12"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c660097a03a..cf393d518ec6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10622,10 +10622,7 @@ with pkgs; plantuml-server = callPackage ../tools/misc/plantuml-server { }; - plan9port = callPackage ../tools/system/plan9port { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa IOKit Metal QuartzCore; - inherit (darwin) DarwinTools; - }; + plan9port = callPackage ../tools/system/plan9port { }; platformioPackages = dontRecurseIntoAttrs (callPackage ../development/embedded/platformio { }); platformio = platformioPackages.platformio-chrootenv;