diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 295938ddd56c..3cc80bf3b640 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14082,6 +14082,12 @@ githubId = 5978566; name = "Yves-Stan Le Cornec"; }; + ylh = { + email = "nixpkgs@ylh.io"; + github = "ylh"; + githubId = 9125590; + name = "Yestin L. Harrison"; + }; ylwghst = { email = "ylwghst@onionmail.info"; github = "ylwghst"; diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index f165bfca4252..1d64e3b93410 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -1,24 +1,17 @@ -{ lib -, stdenv -, fetchFromGitHub -, darwin ? null -, fontconfig ? null -, freetype ? null -, libX11 -, libXext ? null -, libXt ? null -, perl ? null # For building web manuals +{ lib, stdenv, fetchFromGitHub +, fontconfig, freetype, libX11, libXext, libXt, xorgproto +, Carbon, Cocoa, IOKit, Metal, QuartzCore, DarwinTools +, perl # For building web manuals , which -, xorgproto ? null }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "plan9port"; version = "2021-10-19"; - src = fetchFromGitHub { + src = fetchFromGitHub { owner = "9fans"; - repo = "plan9port"; + repo = pname; rev = "d0d440860f2000a1560abb3f593cdc325fcead4c"; hash = "sha256-2aYXqPGwrReyFPrLDtEjgQd/RJjpOfI3ge/tDocYpRQ="; }; @@ -44,22 +37,20 @@ stdenv.mkDerivation { --replace "case Kcmd+'v':" "case 0x16: case Kcmd+'v':" ''; - buildInputs = [ - perl - ] ++ lib.optionals (!stdenv.isDarwin) [ + buildInputs = [ perl ] ++ (if !stdenv.isDarwin then [ fontconfig - freetype # fontsrv wants ft2build.h provides system fonts for acme and sam + freetype # fontsrv wants ft2build.h libX11 libXext libXt xorgproto - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] else [ Carbon Cocoa IOKit Metal QuartzCore - darwin.DarwinTools + DarwinTools ]); builder = ./builder.sh; @@ -100,6 +91,7 @@ stdenv.mkDerivation { ehmry ftrvxmtrx kovirobi + ylh ]; mainProgram = "9"; platforms = platforms.unix; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7820cc6b4d0e..e449c34634bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9703,7 +9703,10 @@ with pkgs; plantuml-server = callPackage ../tools/misc/plantuml-server { }; - plan9port = callPackage ../tools/system/plan9port { }; + plan9port = callPackage ../tools/system/plan9port { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa IOKit Metal QuartzCore; + inherit (darwin) DarwinTools; + }; platformioPackages = dontRecurseIntoAttrs (callPackage ../development/embedded/platformio { }); platformio = platformioPackages.platformio-chrootenv;