diff options
| author | Pavol Rusnak <pavol@rusnak.io> | 2021-01-24 01:40:18 +0100 |
|---|---|---|
| committer | Pavol Rusnak <pavol@rusnak.io> | 2021-01-24 01:49:49 +0100 |
| commit | 90f73381120f7ae9e0d5f0f6dc16cb141c658494 (patch) | |
| tree | 5683ff0c39f9ac901e181fc0591cf03c2b95b07a /pkgs/build-support/release/nix-build.nix | |
| parent | 2f34b4b883932f0ee2c1787e704f3915786e8cca (diff) | |
| download | nixlib-90f73381120f7ae9e0d5f0f6dc16cb141c658494.tar nixlib-90f73381120f7ae9e0d5f0f6dc16cb141c658494.tar.gz nixlib-90f73381120f7ae9e0d5f0f6dc16cb141c658494.tar.bz2 nixlib-90f73381120f7ae9e0d5f0f6dc16cb141c658494.tar.lz nixlib-90f73381120f7ae9e0d5f0f6dc16cb141c658494.tar.xz nixlib-90f73381120f7ae9e0d5f0f6dc16cb141c658494.tar.zst nixlib-90f73381120f7ae9e0d5f0f6dc16cb141c658494.zip | |
treewide: stdenv.lib -> lib
Diffstat (limited to 'pkgs/build-support/release/nix-build.nix')
| -rw-r--r-- | pkgs/build-support/release/nix-build.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix index feda54de46fe..97df52eaced2 100644 --- a/pkgs/build-support/release/nix-build.nix +++ b/pkgs/build-support/release/nix-build.nix @@ -12,7 +12,7 @@ , doCoverityAnalysis ? false , lcovFilter ? [] , lcovExtraTraceFiles ? [] -, src, stdenv +, src, lib, stdenv , name ? if doCoverageAnalysis then "nix-coverage" else "nix-build" , failureHook ? null , prePhases ? [] @@ -69,7 +69,7 @@ stdenv.mkDerivation ( fi ''; - failureHook = (stdenv.lib.optionalString (failureHook != null) failureHook) + + failureHook = (lib.optionalString (failureHook != null) failureHook) + '' if test -n "$succeedOnFailure"; then if test -n "$keepBuildDirectory"; then @@ -136,10 +136,10 @@ stdenv.mkDerivation ( buildInputs = buildInputs ++ - (stdenv.lib.optional doCoverageAnalysis args.makeGCOVReport) ++ - (stdenv.lib.optional doClangAnalysis args.clang-analyzer) ++ - (stdenv.lib.optional doCoverityAnalysis args.cov-build) ++ - (stdenv.lib.optional doCoverityAnalysis args.xz); + (lib.optional doCoverageAnalysis args.makeGCOVReport) ++ + (lib.optional doClangAnalysis args.clang-analyzer) ++ + (lib.optional doCoverityAnalysis args.cov-build) ++ + (lib.optional doCoverityAnalysis args.xz); lcovFilter = ["/nix/store/*"] ++ lcovFilter; |