st: Make patches configurable via config.st.patches.

+8 -2
+3 -1
pkgs/applications/misc/st/default.nix
··· 1 1 { stdenv, fetchurl, pkgconfig, writeText, libX11, ncurses, libXext, libXft, fontconfig 2 - , conf? null}: 2 + , conf ? null, patches ? []}: 3 3 4 4 with stdenv.lib; 5 5 ··· 10 10 url = "http://dl.suckless.org/st/${name}.tar.gz"; 11 11 sha256 = "0avsfc1qp8zvshsfjwwrkvk411jlqy58z225bsdhjkl1qc40qcc5"; 12 12 }; 13 + 14 + inherit patches; 13 15 14 16 configFile = optionalString (conf!=null) (writeText "config.def.h" conf); 15 17 preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
+3 -1
pkgs/applications/misc/st/wayland.nix
··· 1 1 { stdenv, fetchurl, pkgconfig, writeText 2 2 , ncurses, wayland, wld, libxkbcommon, fontconfig, pixman 3 - , conf? null}: 3 + , conf ? null, patches ? [] }: 4 4 5 5 with stdenv.lib; 6 6 ··· 13 13 url = "https://github.com/michaelforney/st/archive/${rev}.tar.gz"; 14 14 sha256 = "7164da135f02405dba5ae3131dfd896e072df29ac6c0928f3b887beffb8a7d97"; 15 15 }; 16 + 17 + inherit patches; 16 18 17 19 configFile = optionalString (conf!=null) (writeText "config.def.h" conf); 18 20 preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
+2
pkgs/top-level/all-packages.nix
··· 13722 13722 13723 13723 st = callPackage ../applications/misc/st { 13724 13724 conf = config.st.conf or null; 13725 + patches = config.st.patches or null; 13725 13726 }; 13726 13727 13727 13728 st-wayland = callPackage ../applications/misc/st/wayland.nix { 13728 13729 conf = config.st.conf or null; 13730 + patches = config.st.patches or null; 13729 13731 }; 13730 13732 13731 13733 stag = callPackage ../applications/misc/stag {