From 6603130e7e1a5d478b6f2be992a0aac9af9fb491 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 17 Mar 2021 16:46:15 -0300 Subject: [PATCH 1/2] xa: fix a typo in substituteInPlace Also, move the file argument --- pkgs/development/compilers/xa/xa.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/xa/xa.nix b/pkgs/development/compilers/xa/xa.nix index 163b0bba513..c445940f5cd 100644 --- a/pkgs/development/compilers/xa/xa.nix +++ b/pkgs/development/compilers/xa/xa.nix @@ -15,13 +15,12 @@ stdenv.mkDerivation rec { dontConfigure = true; postPatch = '' - substitueInPlace \ + substituteInPlace Makefile \ --replace "DESTDIR" "PREFIX" \ - --replace "CC = gcc" "CC = cc" \ - --replace "LDD = gcc" "LDD = ld" \ + --replace "CC = gcc" "CC = ${stdenv.cc.targetPrefix}cc" \ + --replace "LDD = gcc" "LDD = ${stdenv.cc.targetPrefix}cc" \ --replace "CFLAGS = -O2" "CFLAGS ?=" \ - --replace "LDFLAGS = -lc" "LDFLAGS ?= -lc" \ - Makefile + --replace "LDFLAGS = -lc" "LDFLAGS ?= -lc" ''; makeFlags = [ "PREFIX=${placeholder "out"}" ]; From 9b611eb998f33cccedbe165805f80788423e7f6b Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 17 Mar 2021 16:46:33 -0300 Subject: [PATCH 2/2] dxa: move file argument in substituteInPlace --- pkgs/development/compilers/xa/dxa.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/xa/dxa.nix b/pkgs/development/compilers/xa/dxa.nix index e0ff060de8d..03f2d054cc8 100644 --- a/pkgs/development/compilers/xa/dxa.nix +++ b/pkgs/development/compilers/xa/dxa.nix @@ -18,9 +18,8 @@ stdenv.mkDerivation rec { dontConfigure = true; postPatch = '' - substituteInPlace \ - --replace "CC = gcc" "CC = cc' \ - Makefile + substituteInPlace Makefile \ + --replace "CC = gcc" "CC = ${stdenv.cc.targetPrefix}cc" ''; installPhase = ''