diff options
| author | Alex Auvolat <alex@adnab.me> | 2022-09-07 18:30:15 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2022-09-07 18:30:15 +0200 |
| commit | f310fce34b0273f9f75e7a6ea665f51003a1f795 (patch) | |
| tree | 9480af39147f396f36fb8d73241ebcda6a468d4b /nix | |
| parent | 06df301de5ab2068ee55c8663eebafb0d9a26978 (diff) | |
| download | garage-f310fce34b0273f9f75e7a6ea665f51003a1f795.tar.gz garage-f310fce34b0273f9f75e7a6ea665f51003a1f795.zip | |
Inject GIT_VERSION even later
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 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 { |