ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-29 16:57:40 +03:00
Code Issues Projects Releases Wiki Activity

st: fix patches passing

Browse Source
This commit is contained in:
Matthew Bauer 2018-07-17 22:15:13 -04:00
parent d14dedfa2a
commit 0e707034b5
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/misc/st/default.nix
View File

@ -3,8 +3,7 @@
with stdenv.lib;
let patches' = if patches == null then [] else patches;
in stdenv.mkDerivation rec {
stdenv.mkDerivation rec {
name = "st-0.8.1";
src = fetchurl {
@ -12,7 +11,7 @@ in stdenv.mkDerivation rec {
sha256 = "09k94v3n20gg32xy7y68p96x9dq5msl80gknf9gbvlyjp3i0zyy4";
};
patches = patches';
inherit patches;
configFile = optionalString (conf!=null) (writeText "config.def.h" conf);
preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";

2
pkgs/top-level/all-packages.nix
View File

@ -18262,7 +18262,7 @@ with pkgs;
st = callPackage ../applications/misc/st {
conf = config.st.conf or null;
patches = config.st.patches or null;
patches = config.st.patches or [];
extraLibs = config.st.extraLibs or [];
};