From 7111193ee69553c4ba3011b148926fb6f23d5a10 Mon Sep 17 00:00:00 2001 From: Uri Baghin Date: Sat, 13 Nov 2021 11:04:36 +1100 Subject: [PATCH] writers: fix writeRust on darwin --- pkgs/build-support/writers/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/writers/default.nix b/pkgs/build-support/writers/default.nix index 216e41f6d7ec..4b4d4bb203e0 100644 --- a/pkgs/build-support/writers/default.nix +++ b/pkgs/build-support/writers/default.nix @@ -1,4 +1,4 @@ -{ pkgs, buildPackages, lib, gawk, gnused, gixy }: +{ pkgs, buildPackages, lib, stdenv, libiconv, gawk, gnused, gixy }: with lib; rec { @@ -150,10 +150,13 @@ rec { rustcArgs ? [], strip ? true }: + let + darwinArgs = lib.optionals stdenv.isDarwin [ "-L${lib.getLib libiconv}/lib" ]; + in makeBinWriter { compileScript = '' cp "$contentPath" tmp.rs - PATH=${makeBinPath [pkgs.gcc]} ${lib.getBin rustc}/bin/rustc ${lib.escapeShellArgs rustcArgs} -o "$out" tmp.rs + PATH=${makeBinPath [pkgs.gcc]} ${lib.getBin rustc}/bin/rustc ${lib.escapeShellArgs rustcArgs} ${lib.escapeShellArgs darwinArgs} -o "$out" tmp.rs ''; inherit strip; } name;