From e4900a80298e6d3c6b5713b73bba2c92d1a063f2 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 15 Jul 2024 15:38:27 +0300 Subject: [PATCH] pmix: use substituteInPlace in cross-compilation fix This ensures that this doesn't fail if the sed pattern all of a sudden is incorrect --- pkgs/development/libraries/pmix/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pmix/default.nix b/pkgs/development/libraries/pmix/default.nix index 10cc3cac59b7..31325bd4ba0a 100644 --- a/pkgs/development/libraries/pmix/default.nix +++ b/pkgs/development/libraries/pmix/default.nix @@ -71,8 +71,9 @@ stdenv.mkDerivation rec { # Pin the compiler to the current version in a cross compiler friendly way. # Same pattern as for openmpi (see https://github.com/NixOS/nixpkgs/pull/58964#discussion_r275059427). - sed -i 's:compiler=.*:compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc:' \ - $dev/share/pmix/pmixcc-wrapper-data.txt + substituteInPlace $dev/share/pmix/pmixcc-wrapper-data.txt \ + --replace-fail compiler=gcc \ + compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc ''; enableParallelBuilding = true;