nur-packages

commit 5698cb14d9a724ca3278ad93498ac788773a51f6
parent f25db59fec52db0f499d03a9a0924953e0ab76b3
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date:   Sat, 13 Nov 2021 11:57:58 +0300

Fix cross-compilation

Diffstat:
M
pkgs/suckless/json2tsv/default.nix
 | 
2
++
M
pkgs/suckless/lel/default.nix
 | 
2
+-
M
pkgs/suckless/libst/default.nix
 | 
7
+++++++
M
pkgs/suckless/quark/default.nix
 | 
4
+++-
M
pkgs/suckless/saait/default.nix
 | 
2
+-
M
pkgs/suckless/sbase/default.nix
 | 
4
+++-
M
pkgs/suckless/sfeed_curses/default.nix
 | 
2
+-

7 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/pkgs/suckless/json2tsv/default.nix b/pkgs/suckless/json2tsv/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-bpXEVWayFQYJDXDzaJIFuoNJubgbw5URNOpYz3K0DPI=";
   };
 
+  makeFlags = [ "RANLIB:=$(RANLIB)" ];
+
   installFlags = [ "PREFIX=$(out)" ];
 
   meta = with lib; {
diff --git a/pkgs/suckless/lel/default.nix b/pkgs/suckless/lel/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libX11 ];
 
-  makeFlags = [ "PREFIX=$(out)" ];
+  installFlags = [ "PREFIX=$(out)" ];
 
   meta = with lib; {
     description = "Farbfeld image viewer";
diff --git a/pkgs/suckless/libst/default.nix b/pkgs/suckless/libst/default.nix
@@ -11,8 +11,15 @@ stdenv.mkDerivation rec {
     hash = "sha256-vpU1Hbd6c/c0M/eUvQqW7RXHG2bz707LkcKlgFrzHtc=";
   };
 
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace "ar rcs" "\$(AR) rcs"
+  '';
+
   nativeBuildInputs = [ ncurses ];
 
+  buildInputs = [ ncurses ];
+
   postBuild = ''
     make -C examples/svt CFLAGS=-I$PWD LDFLAGS=-L$PWD
   '';
diff --git a/pkgs/suckless/quark/default.nix b/pkgs/suckless/quark/default.nix
@@ -10,7 +10,9 @@ stdenv.mkDerivation {
     sha256 = "sha256-Jtu5zJfHd+6Oq572nVem5msMDCOjdqDNH4SQck8/O5A=";
   };
 
-  makeFlags = [ "PREFIX=$(out)" ];
+  makeFlags = [ "CC:=$(CC)" ];
+
+  installFlags = [ "PREFIX=$(out)" ];
 
   meta = with lib; {
     description = "Extremely small and simple HTTP GET/HEAD-only web server for static content";
diff --git a/pkgs/suckless/saait/default.nix b/pkgs/suckless/saait/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     sha256 = "sha256-bx21xlIAHlPzkKS3jXqNoTJlL1YV1M7zDKUAEjUF8Sg=";
   };
 
-  makeFlags = [ "PREFIX=$(out)" ];
+  installFlags = [ "PREFIX=$(out)" ];
 
   meta = with lib; {
     description = "The most boring static page generator";
diff --git a/pkgs/suckless/sbase/default.nix b/pkgs/suckless/sbase/default.nix
@@ -10,7 +10,9 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-0q3v7E82agburNaOKtXqKBHSLQHuq8swLvPdHsTJmIM=";
   };
 
-  makeFlags = [ "PREFIX=$(out)" ];
+  makeFlags = [ "AR:=$(AR)" "CC:=$(CC)" "RANLIB:=$(RANLIB)" ];
+
+  installFlags = [ "PREFIX=$(out)" ];
 
   meta = with lib; {
     description = "suckless unix tools";
diff --git a/pkgs/suckless/sfeed_curses/default.nix b/pkgs/suckless/sfeed_curses/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ ncurses ];
 
-  makeFlags = [ "PREFIX=$(out)" ];
+  installFlags = [ "PREFIX=$(out)" ];
 
   meta = with lib; {
     description = "sfeed curses UI";