From 869467a69642a3e646beb5bc8fb4d10d652c6ab2 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 22 Jan 2023 12:17:30 +0100 Subject: [PATCH] haskell.compiler.ghc924Binary: remove unnecessary hadrian workaround The fix for the issue we are working around has been released in 9.2.3 already, so we no longer need to apply it manually: https://gitlab.haskell.org/ghc/ghc/-/commit/302eb4c2185acacecaedf8a232098d142a6d6b38 --- pkgs/development/compilers/ghc/9.2.4-binary.nix | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/pkgs/development/compilers/ghc/9.2.4-binary.nix b/pkgs/development/compilers/ghc/9.2.4-binary.nix index 4cd22a358e14..57e0db560a98 100644 --- a/pkgs/development/compilers/ghc/9.2.4-binary.nix +++ b/pkgs/development/compilers/ghc/9.2.4-binary.nix @@ -263,20 +263,6 @@ stdenv.mkDerivation rec { lib.optionalString stdenv.isLinux '' find . -type f -executable -exec patchelf \ --interpreter ${stdenv.cc.bintools.dynamicLinker} {} \; - '' + - # The hadrian install Makefile uses 'xxx' as a temporary placeholder in path - # substitution. Which can break the build if the store path / prefix happens - # to contain this string. This will be fixed with 9.2.3 bindists. - # https://gitlab.haskell.org/ghc/ghc/-/issues/21402 - '' - # Detect hadrian Makefile by checking for the target that has the problem - if grep '^update_package_db' ghc-${version}*/Makefile > /dev/null; then - echo Hadrian bindist, applying workaround for xxx path substitution. - # based on https://gitlab.haskell.org/ghc/ghc/-/commit/dd5fecb0e2990b192d92f4dfd7519ecb33164fad.patch - substituteInPlace ghc-${version}*/Makefile --replace 'xxx' '\0xxx\0' - else - echo Not a hadrian bindist, not applying xxx path workaround. - fi ''; # fix for `configure: error: Your linker is affected by binutils #16177`