diff options
| author | Moritz Ulrich <moritz@tarn-vedra.de> | 2016-04-12 22:44:07 +0200 |
|---|---|---|
| committer | Moritz Ulrich <moritz@tarn-vedra.de> | 2016-04-12 22:45:21 +0200 |
| commit | 0bda52462bc1a1ac5d526dbb490a219ea02b79cf (patch) | |
| tree | beb2e567143111f2a31f13eb6d567aac27c71933 /pkgs/applications/misc/st | |
| parent | b0d2c0cade37a2f2a04f9afa140afdd3d55ad48d (diff) | |
| download | nixlib-0bda52462bc1a1ac5d526dbb490a219ea02b79cf.tar nixlib-0bda52462bc1a1ac5d526dbb490a219ea02b79cf.tar.gz nixlib-0bda52462bc1a1ac5d526dbb490a219ea02b79cf.tar.bz2 nixlib-0bda52462bc1a1ac5d526dbb490a219ea02b79cf.tar.lz nixlib-0bda52462bc1a1ac5d526dbb490a219ea02b79cf.tar.xz nixlib-0bda52462bc1a1ac5d526dbb490a219ea02b79cf.tar.zst nixlib-0bda52462bc1a1ac5d526dbb490a219ea02b79cf.zip | |
st: Make patches configurable via config.st.patches.
Diffstat (limited to 'pkgs/applications/misc/st')
| -rw-r--r-- | pkgs/applications/misc/st/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/misc/st/wayland.nix | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix index 234e8b6ba694..deceba0ea554 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}: +, conf ? null, patches ? []}: with stdenv.lib; @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0avsfc1qp8zvshsfjwwrkvk411jlqy58z225bsdhjkl1qc40qcc5"; }; + inherit patches; + configFile = optionalString (conf!=null) (writeText "config.def.h" conf); preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; diff --git a/pkgs/applications/misc/st/wayland.nix b/pkgs/applications/misc/st/wayland.nix index ed7e0cf7ca1d..4d9f0ef3f8d5 100644 --- a/pkgs/applications/misc/st/wayland.nix +++ b/pkgs/applications/misc/st/wayland.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, writeText , ncurses, wayland, wld, libxkbcommon, fontconfig, pixman -, conf? null}: +, conf ? null, patches ? [] }: with stdenv.lib; @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { sha256 = "7164da135f02405dba5ae3131dfd896e072df29ac6c0928f3b887beffb8a7d97"; }; + inherit patches; + configFile = optionalString (conf!=null) (writeText "config.def.h" conf); preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; |