summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Joseph <adam@westernsemico.com>2022-05-31 16:47:20 -0700
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2022-06-02 18:47:07 +0000
commite3218853e061eaace9636b5addec19ced55baab2 (patch)
tree084a0422b327d4b2a3519150d96b97f925d2e2fd
parentMerge pull request #175890 from NixOS/backport-175647-to-release-22.05 (diff)
downloadnixpkgs-origin/backport-175668-to-release-22.05.tar.gz
libspnav: fix cross-compilationorigin/backport-175668-to-release-22.05
Prior to this commit, pkgsCross.foo.libspnav would fail with something like: ``` /nix/store/...-bash-5.1-p16/bin/bash: line 1: ar: command not found ``` Let's fix that by passing `AR=` in `makeFlags`. (cherry picked from commit 96ac705f1b8e0ab900d3017d3bcb19e16ce1884d)
-rw-r--r--pkgs/development/libraries/libspnav/default.nix5
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libspnav/default.nix b/pkgs/development/libraries/libspnav/default.nix
index 99f2a64d7b12..f6908aa3314f 100644
--- a/pkgs/development/libraries/libspnav/default.nix
+++ b/pkgs/development/libraries/libspnav/default.nix
@@ -21,7 +21,10 @@ stdenv.mkDerivation rec {
];
configureFlags = [ "--disable-debug"];
- makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
+ makeFlags = [
+ "CC=${stdenv.cc.targetPrefix}cc"
+ "AR=${stdenv.cc.targetPrefix}ar"
+ ];
preInstall = ''
mkdir -p $out/{lib,include}