ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-20 08:59:32 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #145746 from sikmir/suckless-cross

Browse Source 
farbfeld,ii,sic,slock,slstatus,wmname: fix cross-compilation
This commit is contained in:
Pascal Wittmann 2021-11-15 19:32:36 +01:00 committed by GitHub
commit 73d60f405a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/misc/slstatus/default.nix
View File

@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libX11 ];
makeFlags = [ "CC:=$(CC)" ];
installFlags = [ "PREFIX=$(out)" ];
meta = {

8
pkgs/applications/misc/wmname/default.nix
View File

@ -9,9 +9,15 @@ stdenv.mkDerivation rec {
sha256 = "559ad188b2913167dcbb37ecfbb7ed474a7ec4bbcb0129d8d5d08cb9208d02c5";
};
postPatch = ''
substituteInPlace Makefile --replace "@strip" "#@strip"
'';
buildInputs = [ libX11 ];
preConfigure = ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk'';
makeFlags = [ "CC:=$(CC)" ];
installFlags = [ "PREFIX=$(out)" ];
meta = {
description = "Prints or set the window manager name property of the root window";

6
pkgs/applications/networking/irc/ii/default.nix
View File

@ -9,9 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "1lk8vjl7i8dcjh4jkg8h8bkapcbs465sy8g9c0chfqsywbmf3ndr";
};
installPhase = ''
make install PREFIX=$out
'';
makeFlags = [ "CC:=$(CC)" ];
installFlags = [ "PREFIX=$(out)" ];
meta = {
homepage = "https://tools.suckless.org/ii/";

5
pkgs/applications/networking/irc/sic/default.nix
View File

@ -4,12 +4,15 @@ stdenv.mkDerivation rec {
pname = "sic";
version = "1.2";
makeFlags = [ "PREFIX=$(out)" ];
src = fetchurl {
url = "https://dl.suckless.org/tools/sic-${version}.tar.gz";
sha256 = "ac07f905995e13ba2c43912d7a035fbbe78a628d7ba1c256f4ca1372fb565185";
};
makeFlags = [ "CC:=$(CC)" ];
installFlags = [ "PREFIX=$(out)" ];
meta = {
description = "Simple IRC client";
homepage = "https://tools.suckless.org/sic/";

2
pkgs/development/libraries/farbfeld/default.nix
View File

@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
buildInputs = [ libpng libjpeg ];
nativeBuildInputs = [ makeWrapper ];
makeFlags = [ "CC:=$(CC)" ];
installFlags = [ "PREFIX=$(out)" ];
postInstall = ''
wrapProgram "$out/bin/2ff" --prefix PATH : "${file}/bin"

4
pkgs/misc/screensavers/slock/default.nix
View File

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = [ xorgproto libX11 libXext libXrandr ];
installFlags = [ "DESTDIR=\${out}" "PREFIX=" ];
installFlags = [ "PREFIX=$(out)" ];
postPatch = "sed -i '/chmod u+s/d' Makefile";
@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
cp ${writeText "config.def.h" conf} config.def.h
'';
makeFlags = [ "CC:=$(CC)" ];
meta = {
homepage = "https://tools.suckless.org/slock";
description = "Simple X display locker";