Unverified Commit 73d60f40 authored by Pascal Wittmann's avatar Pascal Wittmann Committed by GitHub
Browse files

Merge pull request #145746 from sikmir/suckless-cross 

farbfeld,ii,sic,slock,slstatus,wmname: fix cross-compilation
parents 2103db82 24c9cd84

pkgs/applications/misc/slstatus/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec { 
  nativeBuildInputs = [ pkg-config ];

  buildInputs = [ libX11 ];



  makeFlags = [ "CC:=$(CC)" ];



  installFlags = [ "PREFIX=$(out)" ];



  meta = {

pkgs/applications/misc/wmname/default.nix

+7 −1
Original line number Diff line number Diff line
@@ -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";

pkgs/applications/networking/irc/ii/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -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/";

pkgs/applications/networking/irc/sic/default.nix

+4 −1
Original line number Diff line number Diff line
@@ -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/";

pkgs/development/libraries/farbfeld/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -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"