cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

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

Browse source 
pkgsStatic.slstatus: fix build
This commit is contained in:
Franz Pletz 2023-02-25 12:26:25 +01:00 committed by GitHub
commit 45a4acc903
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkgs/applications/misc/slstatus/default.nix
View file

@ -1,4 +1,14 @@
{ 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 { stdenv.mkDerivation rec {
pname = "slstatus"; pname = "slstatus";
@ -11,14 +21,14 @@ stdenv.mkDerivation rec {
}; };
configFile = lib.optionalString (conf!=null) (writeText "config.def.h" conf); 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; inherit patches;
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ libX11 ]; buildInputs = [ libX11 libXau libXdmcp];
makeFlags = [ "CC:=$(CC)" ];
installFlags = [ "PREFIX=$(out)" ]; installFlags = [ "PREFIX=$(out)" ];