Skip to content

Commit

Permalink
fpc: no, that's right, IFD isn't working on GitHub Actions
Browse files Browse the repository at this point in the history
  • Loading branch information
Rhys-T committed Nov 29, 2024
1 parent d957590 commit 60e591d
Showing 1 changed file with 5 additions and 12 deletions.
17 changes: 5 additions & 12 deletions default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -135,20 +135,13 @@ in {
pkgs.hostPlatform.isDarwin &&
!(lib.hasInfix "-syslibroot $SDKROOT" (fpc.preConfigure or ""))
;
nixpkgs-fpc-fix = pkgs.fetchFromGitHub {
name = "nixpkgs-fpc-fix";
owner = "NixOS";
repo = "nixpkgs";
rev = "ce40ce79f14469fd17dfe41c9b51490495d3f99e";
sparseCheckout = [
"pkgs/development/compilers/fpc"
];
nonConeMode = true;
hash = "sha256-fumRYQgvlsLLT48JPNbmP5VZD3D4C6XTfSKxiCDKIno=";
};
in lib.addMetaAttrs ({
description = "${fpc.meta.description or "fpc"} (fixed for macOS/Darwin)";
}) (if needsFix then pkgs.callPackage "${nixpkgs-fpc-fix}/pkgs/development/compilers/fpc/" {} else fpc);
}) (if needsFix then fpc.overrideAttrs (old: {
preConfigure = ''
NIX_LDFLAGS="-syslibroot $SDKROOT -L${lib.getLib pkgs.libiconv}/lib"
'' + (old.preConfigure or "");
}) else fpc);

drl-packages = callPackage ./pkgs/drl/packages.nix {};
inherit (self.drl-packages) drl drl-hq drl-lq;
Expand Down

0 comments on commit 60e591d

Please sign in to comment.