Skip to content

Commit 7d97051

Browse files
adrianparvinoMic92
authored andcommittedMay 21, 2017
st: extraLibs argument
fixes #25956
1 parent bb37fc9 commit 7d97051

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed
 

‎pkgs/applications/misc/st/default.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{ stdenv, fetchurl, pkgconfig, writeText, libX11, ncurses, libXext, libXft
2-
, fontconfig, conf ? null, patches ? []}:
2+
, fontconfig, conf ? null, patches ? [], extraLibs ? []}:
33

44
with stdenv.lib;
55

@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
1717
configFile = optionalString (conf!=null) (writeText "config.def.h" conf);
1818
preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
1919

20-
buildInputs = [ pkgconfig libX11 ncurses libXext libXft fontconfig ];
20+
buildInputs = [ pkgconfig libX11 ncurses libXext libXft fontconfig ] ++ extraLibs;
2121

2222
installPhase = ''
2323
TERMINFO=$out/share/terminfo make install PREFIX=$out

‎pkgs/top-level/all-packages.nix

+1
Original file line numberDiff line numberDiff line change
@@ -15718,6 +15718,7 @@ with pkgs;
1571815718
st = callPackage ../applications/misc/st {
1571915719
conf = config.st.conf or null;
1572015720
patches = config.st.patches or null;
15721+
extraLibs = config.st.extraLibs or [];
1572115722
};
1572215723

1572315724
st-wayland = callPackage ../applications/misc/st/wayland.nix {

0 commit comments

Comments
 (0)