nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 07:23:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #117105 from yurrriq/noweb-prefer-boolean-over-null

Browse Source 
noweb: add useIcon boolean arg
This commit is contained in:
Sandro 2021-03-21 17:22:59 +01:00 committed by GitHub
commit cb9f2fbf5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/tools/literate-programming/noweb/default.nix
View File

@ -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 { lib.fix (noweb: stdenv.mkDerivation rec {
pname = "noweb"; pname = "noweb";
@ -22,14 +22,14 @@ lib.fix (noweb: stdenv.mkDerivation rec {
substituteInPlace Makefile --replace 'strip' '${stdenv.cc.targetPrefix}strip' 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 ]; buildInputs = [ nawk ];
preBuild = '' preBuild = ''
mkdir -p "$out/lib/noweb" mkdir -p "$out/lib/noweb"
''; '';
makeFlags = lib.optionals (!isNull icon-lang) [ makeFlags = lib.optionals useIcon [
"LIBSRC=icon" "LIBSRC=icon"
"ICONC=icont" "ICONC=icont"
] ++ [ "CC=${stdenv.cc.targetPrefix}cc" ]; ] ++ [ "CC=${stdenv.cc.targetPrefix}cc" ];

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

@ -12864,7 +12864,7 @@ in
gconf = pkgs.gnome2.GConf; 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 { }; noweb = callPackage ../development/tools/literate-programming/noweb { };
nuweb = callPackage ../development/tools/literate-programming/nuweb { tex = texlive.combined.scheme-medium; }; nuweb = callPackage ../development/tools/literate-programming/nuweb { tex = texlive.combined.scheme-medium; };