From 97d55ec923b0cd3798a6a84e2e0a6b2c6b54f6a9 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 22 Feb 2023 13:56:03 +0100 Subject: [PATCH] haskell.compiler.ghcHEAD: drop malformed/redundant hadrian setting `*.*.rts.*.opts` is actually copied from the migration GHC blog post, but does not, actually, parse: The format is `....`, so it would need to be `*.rts.ghc.opts`. This is already achieved by the broader rule on the next line. --- pkgs/development/compilers/ghc/common-hadrian.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index cead462b88d1..a85ad54591e6 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -182,7 +182,6 @@ let # be needed for TemplateHaskell. This solution was described in # https://www.tweag.io/blog/2020-09-30-bazel-static-haskell lib.optionals enableRelocatedStaticLibs [ - "*.*.rts.*.opts += -fPIC -fexternal-dynamic-refs" "*.*.ghc.*.opts += -fPIC -fexternal-dynamic-refs" ] ++ lib.optionals targetPlatform.useAndroidPrebuilt [