diff options
| author | Alex Auvolat <alex@adnab.me> | 2022-08-29 16:44:13 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2022-08-29 16:44:13 +0200 |
| commit | ebc20a879812dda6ab240a134a67b4675e24c435 (patch) | |
| tree | 62cff73a1d92b5ab3c7d0526bdd854e6b403ea6d /nix | |
| parent | 16f6a1a65d4b973ea13cd00bbfdd7e225041e447 (diff) | |
| parent | 532eca7ff94e4710283fb38951a349a83654de59 (diff) | |
| download | garage-ebc20a879812dda6ab240a134a67b4675e24c435.tar.gz garage-ebc20a879812dda6ab240a134a67b4675e24c435.zip | |
Merge branch 'main' into lx-perf-improvements
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/compile.nix | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/nix/compile.nix b/nix/compile.nix index 49f7c1d6..7986fb0d 100644 --- a/nix/compile.nix +++ b/nix/compile.nix @@ -129,16 +129,7 @@ let (pkgs.rustBuilder.rustLib.makeOverride { name = "garage_rpc"; - 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); }; overrideArgs = old: { /* [4] */ features = if release then [ "kubernetes-discovery" ] else []; }; @@ -151,7 +142,15 @@ let (pkgs.rustBuilder.rustLib.makeOverride { name = "garage_util"; - overrideAttrs = drv: { /* [1] */ setBuildEnv = (buildEnv drv); }; + overrideAttrs = drv: + (if git_version != null then { + /* [3] */ preConfigure = '' + ${drv.preConfigure or ""} + export GIT_VERSION="${git_version}" + ''; + } else {}) + // + { /* [1] */ setBuildEnv = (buildEnv drv); }; }) (pkgs.rustBuilder.rustLib.makeOverride { |