plan9port: update darwin inputs
This commit is contained in:
parent
1a44a2d355
commit
b82d121152
|
@ -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;
|
||||
|
|
|
@ -9646,7 +9646,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;
|
||||
|
|
Loading…
Reference in a new issue