From 870b0dd84d0826a7f3cacde5389c39cd0c947738 Mon Sep 17 00:00:00 2001
From: Eric Bailey <eric@ericb.me>
Date: Sun, 21 Mar 2021 02:20:51 -0500
Subject: [PATCH] noweb: add useIcon boolean arg

---
 .../tools/literate-programming/noweb/default.nix            | 6 +++---
 pkgs/top-level/all-packages.nix                             | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/literate-programming/noweb/default.nix b/pkgs/development/tools/literate-programming/noweb/default.nix
index e4ebde20390..c0276403516 100644
--- a/pkgs/development/tools/literate-programming/noweb/default.nix
+++ b/pkgs/development/tools/literate-programming/noweb/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, nawk, groff, icon-lang }:
+{ lib, stdenv, fetchFromGitHub, nawk, groff, icon-lang, useIcon ? true }:
 
 lib.fix (noweb: stdenv.mkDerivation rec {
   pname = "noweb";
@@ -22,14 +22,14 @@ lib.fix (noweb: stdenv.mkDerivation rec {
     substituteInPlace Makefile --replace 'strip' '${stdenv.cc.targetPrefix}strip'
   '';
 
-  nativeBuildInputs = [ groff ] ++ lib.optionals (!isNull icon-lang) [ icon-lang ];
+  nativeBuildInputs = [ groff ] ++ lib.optionals useIcon [ icon-lang ];
   buildInputs = [ nawk ];
 
   preBuild = ''
     mkdir -p "$out/lib/noweb"
   '';
 
-  makeFlags = lib.optionals (!isNull icon-lang) [
+  makeFlags = lib.optionals useIcon [
     "LIBSRC=icon"
     "ICONC=icont"
   ] ++ [ "CC=${stdenv.cc.targetPrefix}cc" ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 54c6537f63a..bde1fa81a35 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12863,7 +12863,7 @@ in
     gconf = pkgs.gnome2.GConf;
   };
 
-  # NOTE: Override and set icon-lang = null to use Awk instead of Icon.
+  # NOTE: Override and set useIcon = false to use Awk instead of Icon.
   noweb = callPackage ../development/tools/literate-programming/noweb { };
 
   nuweb = callPackage ../development/tools/literate-programming/nuweb { tex = texlive.combined.scheme-medium; };