Merge pull request #145746 from sikmir/suckless-cross
farbfeld,ii,sic,slock,slstatus,wmname: fix cross-compilation
commit73d60f405aee841b1026693c5e0551ed9eeca2bd
authorPascal Wittmann <mail@pascal-wittmann.de>
dateMon 15 Nov 2021, 19:32 (5 years ago)
parent2103db824c9cd8
pkgs/applications/misc/slstatus/default.nix+2
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
2020 nativeBuildInputs = [ pkg-config ];
2121 buildInputs = [ libX11 ];
2222
23+ makeFlags = [ "CC:=$(CC)" ];
24+
2325 installFlags = [ "PREFIX=$(out)" ];
2426
2527 meta = {
pkgs/applications/misc/wmname/default.nix+7−1
@@ -9,9 +9,15 @@ stdenv.mkDerivation rec {
99 sha256 = "559ad188b2913167dcbb37ecfbb7ed474a7ec4bbcb0129d8d5d08cb9208d02c5";
1010 };
1111
12+ postPatch = ''
13+ substituteInPlace Makefile --replace "@strip" "#@strip"
14+ '';
15+
1216 buildInputs = [ libX11 ];
1317
14− preConfigure = ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk'';
18+ makeFlags = [ "CC:=$(CC)" ];
19+
20+ installFlags = [ "PREFIX=$(out)" ];
1521
1622 meta = {
1723 description = "Prints or set the window manager name property of the root window";
pkgs/applications/networking/irc/ii/default.nix+3−3
@@ -9,9 +9,9 @@ stdenv.mkDerivation rec {
99 sha256 = "1lk8vjl7i8dcjh4jkg8h8bkapcbs465sy8g9c0chfqsywbmf3ndr";
1010 };
1111
12− installPhase = ''
13− make install PREFIX=$out
14− '';
12+ makeFlags = [ "CC:=$(CC)" ];
13+
14+ installFlags = [ "PREFIX=$(out)" ];
1515
1616 meta = {
1717 homepage = "https://tools.suckless.org/ii/";
pkgs/applications/networking/irc/sic/default.nix+4−1
@@ -4,12 +4,15 @@ stdenv.mkDerivation rec {
44 pname = "sic";
55 version = "1.2";
66
7− makeFlags = [ "PREFIX=$(out)" ];
87 src = fetchurl {
98 url = "https://dl.suckless.org/tools/sic-${version}.tar.gz";
109 sha256 = "ac07f905995e13ba2c43912d7a035fbbe78a628d7ba1c256f4ca1372fb565185";
1110 };
1211
12+ makeFlags = [ "CC:=$(CC)" ];
13+
14+ installFlags = [ "PREFIX=$(out)" ];
15+
1316 meta = {
1417 description = "Simple IRC client";
1518 homepage = "https://tools.suckless.org/sic/";
pkgs/development/libraries/farbfeld/default.nix+2
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
1212 buildInputs = [ libpng libjpeg ];
1313 nativeBuildInputs = [ makeWrapper ];
1414
15+ makeFlags = [ "CC:=$(CC)" ];
16+
1517 installFlags = [ "PREFIX=$(out)" ];
1618 postInstall = ''
1719 wrapProgram "$out/bin/2ff" --prefix PATH : "${file}/bin"
pkgs/misc/screensavers/slock/default.nix+3−1
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616
1717 buildInputs = [ xorgproto libX11 libXext libXrandr ];
1818
19− installFlags = [ "DESTDIR=\${out}" "PREFIX=" ];
19+ installFlags = [ "PREFIX=$(out)" ];
2020
2121 postPatch = "sed -i '/chmod u+s/d' Makefile";
2222
@@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
2424 cp ${writeText "config.def.h" conf} config.def.h
2525 '';
2626
27+ makeFlags = [ "CC:=$(CC)" ];
28+
2729 meta = {
2830 homepage = "https://tools.suckless.org/slock";
2931 description = "Simple X display locker";