aboutsummaryrefslogtreecommitdiff
path: root/nix
diff options
context:
space:
mode:
Diffstat (limited to 'nix')
-rw-r--r--nix/compile.nix20
1 files changed, 10 insertions, 10 deletions
diff --git a/nix/compile.nix b/nix/compile.nix
index d24cd917..512a7354 100644
--- a/nix/compile.nix
+++ b/nix/compile.nix
@@ -124,7 +124,15 @@ let
*/
(pkgs.rustBuilder.rustLib.makeOverride {
name = "garage";
- overrideAttrs = drv: {
+ overrideAttrs = drv:
+ (if git_version != null then {
+ /* [3] */ preConfigure = ''
+ ${drv.preConfigure or ""}
+ export GIT_VERSION="${git_version}"
+ '';
+ } else {})
+ //
+ {
/* [1] */ setBuildEnv = (buildEnv drv);
/* [2] */ hardeningDisable = [ "pie" ];
};
@@ -161,15 +169,7 @@ let
(pkgs.rustBuilder.rustLib.makeOverride {
name = "garage_model";
- overrideAttrs = drv:
- (if git_version != null then {
- /* [3] */ preConfigure = ''
- ${drv.preConfigure or ""}
- export GIT_VERSION="${git_version}"
- '';
- } else {})
- //
- { /* [1] */ setBuildEnv = (buildEnv drv); };
+ overrideAttrs = drv: { /* [1] */ setBuildEnv = (buildEnv drv); };
})
(pkgs.rustBuilder.rustLib.makeOverride {