diff options
| author | Artturin <Artturin@artturin.com> | 2022-10-03 16:56:51 +0300 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2022-10-10 15:30:59 +0300 |
| commit | f4ea1208ec732d423a784bbb2b882f997b6af902 (patch) | |
| tree | cadc358926dfd142fb2c1ebf0dce6317b48474dc /pkgs/build-support/release | |
| parent | 8d32772702a4ebdf15c77e2e927787ae360a6bf6 (diff) | |
treewide: *Flags convert to list from str
*Flags implies a list slightly relevant: > stdenv: start deprecating non-list configureFlags https://github.com/NixOS/nixpkgs/pull/173172 the makeInstalledTests function in `nixos/tests/installed-tests/default.nix` isn't available outside of nixpkgs so it's not a breaking change
Diffstat (limited to 'pkgs/build-support/release')
| -rw-r--r-- | pkgs/build-support/release/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/build-support/release/maven-build.nix | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/build-support/release/default.nix b/pkgs/build-support/release/default.nix index d593ec81197e4..da1078369a584 100644 --- a/pkgs/build-support/release/default.nix +++ b/pkgs/build-support/release/default.nix @@ -15,7 +15,7 @@ rec { } // args); mvnBuild = args: import ./maven-build.nix ( - { inherit stdenv; + { inherit lib stdenv; } // args); nixBuild = args: import ./nix-build.nix ( diff --git a/pkgs/build-support/release/maven-build.nix b/pkgs/build-support/release/maven-build.nix index eaa47647287c6..daee44b85accd 100644 --- a/pkgs/build-support/release/maven-build.nix +++ b/pkgs/build-support/release/maven-build.nix @@ -1,4 +1,5 @@ { stdenv +, lib , name , src , doTest ? true @@ -12,7 +13,11 @@ } @ args : let - mvnFlags = "-Dmaven.repo.local=$M2_REPO ${if doTest then "" else "-Dmaven.test.skip.exec=true"} ${extraMvnFlags}"; + mvnFlags = lib.escapeShellArgs [ + "-Dmaven.repo.local=$M2_REPO" + (lib.optionalString (!doTest) "-Dmaven.test.skip.exec=true") + "${extraMvnFlags}" + ]; in stdenv.mkDerivation ( { |