From 6b05f2e1960e5fde7ad723f3a9e09e06565795e3 Mon Sep 17 00:00:00 2001
From: Efraim Flashner
Date: Wed, 18 Aug 2021 11:15:48 +0300
Subject: gn: make sure we use the correct rust version

---
 gn/packages/bioinformatics.scm | 5 ++++-
 gn/packages/crates-io.scm      | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'gn')

diff --git a/gn/packages/bioinformatics.scm b/gn/packages/bioinformatics.scm
index b2ff1ed..d8f0c9a 100644
--- a/gn/packages/bioinformatics.scm
+++ b/gn/packages/bioinformatics.scm
@@ -472,7 +472,10 @@ reads.")
               (("^handlegraph.*") "handlegraph = \"0.7\"\n"))))))
     (build-system cargo-build-system)
     (arguments
-     `(#:rust ,rust-1.49        ; or later
+     `(#:rust ,(if (> (string->number (version-major+minor (package-version rust-1.49)))
+                      (string->number (version-major+minor (package-version rust))))
+                 rust-1.49
+                 rust)
        #:cargo-inputs
        (("rust-clap" ,rust-clap-3)
         ("rust-rustc-hash" ,rust-rustc-hash-1)
diff --git a/gn/packages/crates-io.scm b/gn/packages/crates-io.scm
index 01438d8..2af14f4 100644
--- a/gn/packages/crates-io.scm
+++ b/gn/packages/crates-io.scm
@@ -24,7 +24,10 @@
          (base32
           "1frlcdwhycjvizb0gfb0v36vxjdi0jxagl2l2v6dzdjxpaawv9rs"))))
     (arguments
-     `(#:rust ,rust-1.47      ; or later
+     `(#:rust ,(if (> (string->number (version-major+minor (package-version rust-1.47)))
+                      (string->number (version-major+minor (package-version rust))))
+                 rust-1.47
+                 rust)
        #:cargo-inputs
        (("rust-anyhow" ,rust-anyhow-1)
         ("rust-boomphf" ,rust-boomphf-0.5)
-- 
cgit v1.2.3