summaryrefslogtreecommitdiff
path: root/nix/derivation.nix
diff options
context:
space:
mode:
authorseth <[email protected]>2024-04-21 19:49:14 +0000
committerGitHub <[email protected]>2024-04-21 19:49:14 +0000
commitf6e1aa350d6b23a4ffb63fc859c89b79ec6ce8d0 (patch)
treea1c8940feba0f2922cc18a958594c12b622e5efd /nix/derivation.nix
parentae1dc52060791990f994df6ecfd4960e6ff3fe5c (diff)
nix: remove subflake (#174)
Diffstat (limited to 'nix/derivation.nix')
-rw-r--r--nix/derivation.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/nix/derivation.nix b/nix/derivation.nix
index fa4867a..6a25976 100644
--- a/nix/derivation.nix
+++ b/nix/derivation.nix
@@ -3,7 +3,7 @@
stdenv,
rustPlatform,
darwin,
- self,
+ self ? {inherit ((lib.importTOML ../Cargo.toml).package) version;},
lto ? true,
optimizeSize ? false,
}:
@@ -11,7 +11,8 @@ rustPlatform.buildRustPackage {
pname = "teawiebot";
version =
(lib.importTOML ../Cargo.toml).package.version
- + "-${self.shortRev or self.dirtyShortRev or "unknown-dirty"}";
+ + "-"
+ + self.shortRev or self.dirtyShortRev or self.version or "unknown";
__structuredAttrs = true;
@@ -43,7 +44,7 @@ rustPlatform.buildRustPackage {
);
in
{
- GIT_SHA = self.shortRev or self.dirtyShortRev or "unknown-dirty";
+ GIT_SHA = self.shortRev or self.dirtyShortRev or "unknown";
}
// lib.optionalAttrs lto (toRustFlags {
lto = "thin";