From 7d97051f7212a3d6c5e1209bdc8e6acef3bcfe18 Mon Sep 17 00:00:00 2001 From: "Adrian Parvin D. Ouano" Date: Sun, 21 May 2017 11:24:40 +0800 Subject: [PATCH] st: extraLibs argument fixes #25956 --- pkgs/applications/misc/st/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix index 704262da5bf5..9b3dc84bcbd5 100644 --- a/pkgs/applications/misc/st/default.nix +++ b/pkgs/applications/misc/st/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, writeText, libX11, ncurses, libXext, libXft -, fontconfig, conf ? null, patches ? []}: +, fontconfig, conf ? null, patches ? [], extraLibs ? []}: with stdenv.lib; @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { configFile = optionalString (conf!=null) (writeText "config.def.h" conf); 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 = '' TERMINFO=$out/share/terminfo make install PREFIX=$out diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8cdd33df7edc..f88706b61352 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15718,6 +15718,7 @@ with pkgs; st = callPackage ../applications/misc/st { conf = config.st.conf or null; patches = config.st.patches or null; + extraLibs = config.st.extraLibs or []; }; st-wayland = callPackage ../applications/misc/st/wayland.nix {