diff options
| author | Alex Auvolat <alex@adnab.me> | 2022-09-07 11:59:56 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2022-09-07 11:59:56 +0200 |
| commit | db61f41030678c5756c844c8aa41a210c658769e (patch) | |
| tree | 492bff626d37cbcdfb2a65ee2580a1cc60c13125 /nix | |
| parent | 6f02c36a89d93b04944a3f0882b6f6b703d9c012 (diff) | |
| download | garage-db61f41030678c5756c844c8aa41a210c658769e.tar.gz garage-db61f41030678c5756c844c8aa41a210c658769e.zip | |
Move GIT_VERSION injection later in build chain to reduce build times
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/compile.nix | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/nix/compile.nix b/nix/compile.nix index ea431a7e..d24cd917 100644 --- a/nix/compile.nix +++ b/nix/compile.nix @@ -146,15 +146,7 @@ let (pkgs.rustBuilder.rustLib.makeOverride { name = "garage_util"; - 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 { @@ -169,7 +161,15 @@ let (pkgs.rustBuilder.rustLib.makeOverride { name = "garage_model"; - 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 { |