diff options
author | Rick van Schijndel <Mindavi@users.noreply.github.com> | 2021-05-22 17:00:24 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-22 17:00:24 +0200 |
commit | 7c1d8636dd990e4763659cc1a7b5134c2a4637b8 (patch) | |
tree | 98e8d9d6ac4f4f3eefce318866728b8b39b07baf /pkgs/applications/terminal-emulators/st | |
parent | 31aab8c980225348e154b77c0d1f591f78523f2e (diff) | |
download | nixpkgs-7c1d8636dd990e4763659cc1a7b5134c2a4637b8.tar nixpkgs-7c1d8636dd990e4763659cc1a7b5134c2a4637b8.tar.gz nixpkgs-7c1d8636dd990e4763659cc1a7b5134c2a4637b8.tar.bz2 nixpkgs-7c1d8636dd990e4763659cc1a7b5134c2a4637b8.tar.lz nixpkgs-7c1d8636dd990e4763659cc1a7b5134c2a4637b8.tar.xz nixpkgs-7c1d8636dd990e4763659cc1a7b5134c2a4637b8.tar.zst nixpkgs-7c1d8636dd990e4763659cc1a7b5134c2a4637b8.zip |
st: support cross-compilation (#123722)
Diffstat (limited to 'pkgs/applications/terminal-emulators/st')
-rw-r--r-- | pkgs/applications/terminal-emulators/st/default.nix | 42 |
1 files changed, 35 insertions, 7 deletions
diff --git a/pkgs/applications/terminal-emulators/st/default.nix b/pkgs/applications/terminal-emulators/st/default.nix index 4e43bed0a07..591b68b49ab 100644 --- a/pkgs/applications/terminal-emulators/st/default.nix +++ b/pkgs/applications/terminal-emulators/st/default.nix @@ -1,5 +1,17 @@ -{ lib, stdenv, fetchurl, pkg-config, writeText, libX11, ncurses -, libXft, conf ? null, patches ? [], extraLibs ? []}: +{ lib +, stdenv +, fetchurl +, pkg-config +, writeText +, libX11 +, ncurses +, fontconfig +, freetype +, libXft +, conf ? null +, patches ? [ ] +, extraLibs ? [ ] +}: with lib; @@ -14,18 +26,34 @@ stdenv.mkDerivation rec { inherit patches; - configFile = optionalString (conf!=null) (writeText "config.def.h" conf); + configFile = optionalString (conf != null) (writeText "config.def.h" conf); - postPatch = optionalString (conf!=null) "cp ${configFile} config.def.h" - + optionalString stdenv.isDarwin '' + postPatch = optionalString (conf != null) "cp ${configFile} config.def.h" + + optionalString stdenv.isDarwin '' substituteInPlace config.mk --replace "-lrt" "" ''; - nativeBuildInputs = [ pkg-config ncurses ]; - buildInputs = [ libX11 libXft ] ++ extraLibs; + strictDeps = true; + + makeFlags = [ + "PKG_CONFIG=${stdenv.cc.targetPrefix}pkg-config" + ]; + + nativeBuildInputs = [ + pkg-config + ncurses + fontconfig + freetype + ]; + buildInputs = [ + libX11 + libXft + ] ++ extraLibs; installPhase = '' + runHook preInstall TERMINFO=$out/share/terminfo make install PREFIX=$out + runHook postInstall ''; meta = { |