diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2018-07-28 19:25:14 +0200 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2018-07-28 19:25:14 +0200 |
| commit | f54b387b63299245092d9bbf09cb562bac125461 (patch) | |
| tree | 0c09809c0964d7bd931c6c8d1a7d19dcac342abd /pkgs/applications/misc/st | |
| parent | 66d7126255b96a3d9c1cc0cdd7c2cd79d1789758 (diff) | |
| parent | 0fa2cbf59f7f68a8b9213a9cf9d2cd6dd2e518cc (diff) | |
| download | nixlib-f54b387b63299245092d9bbf09cb562bac125461.tar nixlib-f54b387b63299245092d9bbf09cb562bac125461.tar.gz nixlib-f54b387b63299245092d9bbf09cb562bac125461.tar.bz2 nixlib-f54b387b63299245092d9bbf09cb562bac125461.tar.lz nixlib-f54b387b63299245092d9bbf09cb562bac125461.tar.xz nixlib-f54b387b63299245092d9bbf09cb562bac125461.tar.zst nixlib-f54b387b63299245092d9bbf09cb562bac125461.zip | |
Merge remote-tracking branch 'central/master' into viric_clean
Diffstat (limited to 'pkgs/applications/misc/st')
| -rw-r--r-- | pkgs/applications/misc/st/default.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix index e5cfa145bc25..efaf986a9e54 100644 --- a/pkgs/applications/misc/st/default.nix +++ b/pkgs/applications/misc/st/default.nix @@ -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"; |