Unverified Commit 45a4acc9 authored by Franz Pletz's avatar Franz Pletz Committed by GitHub
Browse files

Merge pull request #216541 from KAction/patch/v1/pkgsStatic.slstatus 

pkgsStatic.slstatus: fix build
parents ba2ea52f 402b1ebd

pkgs/applications/misc/slstatus/default.nix

+15 −5
Original line number Diff line number Diff line 
{ lib, stdenv, fetchgit, pkg-config, writeText, libX11, conf ? null, patches ? [] }:

{ lib

, stdenv

, fetchgit

, pkg-config

, writeText

, libX11

, libXau

, libXdmcp

, conf ? null

, patches ? []

}:



stdenv.mkDerivation rec {

  pname = "slstatus";
@@ -11,14 +21,14 @@ stdenv.mkDerivation rec { 
  };



  configFile = lib.optionalString (conf!=null) (writeText "config.def.h" conf);

  preBuild = lib.optionalString (conf!=null) "cp ${configFile} config.def.h";

  preBuild = lib.optionalString (conf!=null) "cp ${configFile} config.def.h" + ''

    makeFlagsArray+=(LDLIBS="-lX11 -lxcb -lXau -lXdmcp" CC=$CC)

  '';



  inherit patches;



  nativeBuildInputs = [ pkg-config ];

  buildInputs = [ libX11 ];



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

  buildInputs = [ libX11 libXau libXdmcp];



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