From 41889978d3584904e99a2db9b08e7dc5127e54a4 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 23 Dec 2022 17:15:32 +0100 Subject: [PATCH] plan9port: unbreak on x86_64-darwin --- pkgs/tools/system/plan9port/default.nix | 8 +------- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index b1f963e807f0..2aab36372715 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -2,13 +2,9 @@ , fontconfig, freetype, libX11, libXext, libXt, xorgproto , perl # For building web manuals , which, ed -, darwin +, Carbon, Cocoa, IOKit, Metal, QuartzCore, DarwinTools # For building on 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"; @@ -121,8 +117,6 @@ stdenv.mkDerivation rec { ]; mainProgram = "9"; platforms = platforms.unix; - # TODO: revisit this when the sdk situation on x86_64-darwin changes - broken = stdenv.isDarwin && stdenv.isx86_64; }; } # TODO: investigate the mouse chording support patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aed4f4b75471..2df271dd0974 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10661,7 +10661,10 @@ with pkgs; plantuml-server = callPackage ../tools/misc/plantuml-server { }; - plan9port = callPackage ../tools/system/plan9port { }; + plan9port = darwin.apple_sdk_11_0.callPackage ../tools/system/plan9port { + inherit (darwin.apple_sdk_11_0.frameworks) Carbon Cocoa IOKit Metal QuartzCore; + inherit (darwin) DarwinTools; + }; platformioPackages = dontRecurseIntoAttrs (callPackage ../development/embedded/platformio { }); platformio = platformioPackages.platformio-chrootenv;