public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

st: extraLibs argument

Browse Source 
fixes #25956
This commit is contained in:
Adrian Parvin D. Ouano 2017-05-21 11:24:40 +08:00 committed by Jörg Thalheim
parent bb37fc90c7
commit 7d97051f72
No known key found for this signature in database
GPG Key ID: CA4106B8D7CC79FA
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/misc/st/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, writeText, libX11, ncurses, libXext, libXft { stdenv, fetchurl, pkgconfig, writeText, libX11, ncurses, libXext, libXft
, fontconfig, conf ? null, patches ? []}: , fontconfig, conf ? null, patches ? [], extraLibs ? []}:
with stdenv.lib; with stdenv.lib;
@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
configFile = optionalString (conf!=null) (writeText "config.def.h" conf); configFile = optionalString (conf!=null) (writeText "config.def.h" conf);
preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
buildInputs = [ pkgconfig libX11 ncurses libXext libXft fontconfig ]; buildInputs = [ pkgconfig libX11 ncurses libXext libXft fontconfig ] ++ extraLibs;
installPhase = '' installPhase = ''
TERMINFO=$out/share/terminfo make install PREFIX=$out TERMINFO=$out/share/terminfo make install PREFIX=$out

1
pkgs/top-level/all-packages.nix
View File

@ -15718,6 +15718,7 @@ with pkgs;
st = callPackage ../applications/misc/st { st = callPackage ../applications/misc/st {
conf = config.st.conf or null; conf = config.st.conf or null;
patches = config.st.patches or null; patches = config.st.patches or null;
extraLibs = config.st.extraLibs or [];
}; };
st-wayland = callPackage ../applications/misc/st/wayland.nix { st-wayland = callPackage ../applications/misc/st/wayland.nix {