Skip to content

Commit d9bb0c4

Browse files
committed
Remove overlay/ghc.nix
It breaks the `override` function on the ghc compilers and it only serves to add "stackprotector" to `hardeningDisable`. We can just add that to `compiler/ghc/default.nix`. It looks like it also added "format", but that is already present. For `hostPlatform.isAarch32` it adds "pie" (not already present), but we don't build GHC on 32bit arm.
1 parent 8260385 commit d9bb0c4

File tree

3 files changed

+1
-32
lines changed

3 files changed

+1
-32
lines changed

compiler/ghc/default.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -546,7 +546,7 @@ stdenv.mkDerivation (rec {
546546

547547
checkTarget = "test";
548548

549-
hardeningDisable = [ "format" ]
549+
hardeningDisable = [ "format" "stackprotector" ]
550550
++ lib.optional stdenv.targetPlatform.isAarch32 "pic"
551551
++ lib.optional stdenv.targetPlatform.isMusl "pie"
552552
++ lib.optional enableDWARF "fortify";

overlays/default.nix

-2
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ let
7676

7777
bootstrap = import ./bootstrap.nix;
7878
compiler-llvm = import ./compiler-llvm.nix;
79-
ghc = import ./ghc.nix;
8079
ghc-packages = import ./ghc-packages.nix;
8180
darwin = import ./darwin.nix;
8281
windows = import ./windows.nix;
@@ -114,7 +113,6 @@ let
114113
nix-tools
115114
bootstrap
116115
compiler-llvm
117-
ghc
118116
ghc-packages
119117
darwin
120118
windows

overlays/ghc.nix

-29
This file was deleted.

0 commit comments

Comments
 (0)