Skip to content

Commit

Permalink
Remove Darwin patch
Browse files Browse the repository at this point in the history
  • Loading branch information
palas committed Sep 18, 2024
1 parent 4f7cdac commit 47d4f27
Showing 1 changed file with 2 additions and 11 deletions.
13 changes: 2 additions & 11 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,6 @@
inherit (inputs.haskellNix) config;
};
inherit (nixpkgs) lib;
macOS-security =
# make `/usr/bin/security` available in `PATH`, which is needed for stack
# on darwin which calls this binary to find certificates
nixpkgs.writeScriptBin "security" ''exec /usr/bin/security "$@"'';
isDarwin = (system == "x86_64-darwin") || (system == "aarch64-darwin");
gitRevFlag =
if inputs.self ? rev
then [("--ghc-option=-D__GIT_REV__=\\\"" + inputs.self.rev + "\\\"")]
Expand Down Expand Up @@ -118,7 +113,7 @@
stylish-haskell = "0.14.6.0";
};
# and from nixpkgs or other inputs
shell.nativeBuildInputs = with nixpkgs; [gh jq yq-go actionlint shellcheck cabal-head] ++ (lib.optional isDarwin macOS-security);
shell.nativeBuildInputs = with nixpkgs; [gh jq yq-go actionlint shellcheck cabal-head];
# disable Hoogle until someone request it
shell.withHoogle = false;
# Skip cross compilers for the shell
Expand Down Expand Up @@ -165,11 +160,7 @@
in ''
${exportCliPath}
cp -r ${filteredProjectBase}/* ..
'' + (if isDarwin
then ''
export PATH=${macOS-security}/bin:$PATH
''
else '''');
'';
})
{
packages.crypton-x509-system.postPatch = ''
Expand Down

0 comments on commit 47d4f27

Please sign in to comment.