mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-30 19:02:57 +00:00
fpc: fix darwin build (#359218)
This commit is contained in:
commit
43e88080cf
@ -1,4 +1,4 @@
|
|||||||
{ lib, stdenv, fetchurl, gawk, fetchpatch, undmg, cpio, xar, darwin, libiconv }:
|
{ lib, stdenv, fetchurl, gawk, fetchpatch, undmg, cpio, xar, libiconv }:
|
||||||
|
|
||||||
let startFPC = import ./binary.nix { inherit stdenv fetchurl undmg cpio xar lib; }; in
|
let startFPC = import ./binary.nix { inherit stdenv fetchurl undmg cpio xar lib; }; in
|
||||||
|
|
||||||
@ -11,11 +11,7 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "85ef993043bb83f999e2212f1bca766eb71f6f973d362e2290475dbaaf50161f";
|
sha256 = "85ef993043bb83f999e2212f1bca766eb71f6f973d362e2290475dbaaf50161f";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ startFPC gawk ]
|
buildInputs = [ startFPC gawk ];
|
||||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
|
||||||
libiconv
|
|
||||||
darwin.apple_sdk.frameworks.CoreFoundation
|
|
||||||
];
|
|
||||||
|
|
||||||
glibc = stdenv.cc.libc.out;
|
glibc = stdenv.cc.libc.out;
|
||||||
|
|
||||||
@ -46,8 +42,9 @@ stdenv.mkDerivation rec {
|
|||||||
--replace "-no_uuid" ""
|
--replace "-no_uuid" ""
|
||||||
'';
|
'';
|
||||||
|
|
||||||
NIX_LDFLAGS = lib.optionalString
|
preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||||
stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; "-F${CoreFoundation}/Library/Frameworks");
|
NIX_LDFLAGS="-syslibroot $SDKROOT -L${lib.getLib libiconv}/lib"
|
||||||
|
'';
|
||||||
|
|
||||||
makeFlags = [ "NOGDB=1" "FPC=${startFPC}/bin/fpc" ];
|
makeFlags = [ "NOGDB=1" "FPC=${startFPC}/bin/fpc" ];
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user