Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 10a25e9b52e1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2b51328002dd
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jun 17, 2019

  1. waf: Added support for optional extra tools (#63042) 

    The list of tools `withTools` are included as extra tools when building
waf.

Example:

    mywaf = callPackage ../development/tools/build-managers/waf {
      python = python3;
      withTools = [ "doxygen" ];
    };
    @xbreak @veprbl
    xbreak authored and veprbl committed Jun 17, 2019
    Copy the full SHA
    2b51328 View commit details
Showing with 9 additions and 3 deletions.
  1. +9 −3 pkgs/development/tools/build-managers/waf/default.nix
12 changes: 9 additions & 3 deletions pkgs/development/tools/build-managers/waf/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
{ stdenv, fetchFromGitLab, fetchpatch, python, ensureNewerSourcesForZipFilesHook }:

{ stdenv, fetchFromGitLab, fetchpatch, python, ensureNewerSourcesForZipFilesHook
# optional list of extra waf tools, e.g. `[ "doxygen" "pytest" ]`
, withTools ? null
}:
let
wafToolsArg = with stdenv.lib.strings;
optionalString (!isNull withTools) " --tools=\"${concatStringsSep "," withTools}\"";
in
stdenv.mkDerivation rec {
name = "waf-${version}";
version = "2.0.15";
@@ -24,7 +30,7 @@ stdenv.mkDerivation rec {
python waf-light configure
'';
buildPhase = ''
python waf-light build
python waf-light build${wafToolsArg}
'';
installPhase = ''
install waf $out