colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

plan9port: unbreak on x86_64-darwin

Browse Source
This commit is contained in:
Weijia Wang 2022-12-23 17:15:32 +01:00
parent 338bf0b325
commit 41889978d3
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/tools/system/plan9port/default.nix
View File

@ -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

5
pkgs/top-level/all-packages.nix
View File

@ -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;