diff options
| author | Artturi <Artturin@artturin.com> | 2022-10-13 00:08:01 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-13 00:08:01 +0300 |
| commit | e66d2fd89d40eb37979834c934413635d0841646 (patch) | |
| tree | 5df3d1319f3bd4153eaf6c7c14138a0cb1042691 /pkgs/build-support | |
| parent | 34493676f6616fdfb85ee76e4b7fe1c1cf0703d1 (diff) | |
| parent | 7e49471316373c471a3bf4b78c130ebc907ae2d2 (diff) | |
Merge pull request #194256 from Artturin/treewides2
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/release/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/build-support/release/maven-build.nix | 7 | ||||
| -rw-r--r-- | pkgs/build-support/skaware/build-skaware-package.nix | 2 |
3 files changed, 8 insertions, 3 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 ( { diff --git a/pkgs/build-support/skaware/build-skaware-package.nix b/pkgs/build-support/skaware/build-skaware-package.nix index 1988d95212c30..3ae9b7ce8aac2 100644 --- a/pkgs/build-support/skaware/build-skaware-package.nix +++ b/pkgs/build-support/skaware/build-skaware-package.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation { inherit postConfigure; - makeFlags = lib.optional stdenv.cc.isClang [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" ]; + makeFlags = lib.optionals stdenv.cc.isClang [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" ]; # TODO(Profpatsch): ensure that there is always a $doc output! postInstall = '' |