From 4f60bd6add62e71c11c51aead8122437b39dafed Mon Sep 17 00:00:00 2001
From: Thomas Watson <twatson52@icloud.com>
Date: Wed, 2 Oct 2024 20:42:17 -0500
Subject: [PATCH] nextpnr: fix version display

---
 pkgs/by-name/ne/nextpnr/package.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ne/nextpnr/package.nix b/pkgs/by-name/ne/nextpnr/package.nix
index b6a3b6974d74..b3dee524f7a7 100644
--- a/pkgs/by-name/ne/nextpnr/package.nix
+++ b/pkgs/by-name/ne/nextpnr/package.nix
@@ -47,8 +47,12 @@ stdenv.mkDerivation rec {
     ++ (lib.optional enableGui qtbase)
     ++ (lib.optional stdenv.cc.isClang llvmPackages.openmp);
 
-  cmakeFlags =
-    [ "-DCURRENT_GIT_VERSION=${lib.substring 0 7 (lib.elemAt srcs 0).rev}"
+  cmakeFlags = let
+    # the specified version must always start with "nextpnr-", so add it if
+    # missing (e.g. if the user overrides with a git hash)
+    rev = main_src.rev;
+    version = if (lib.hasPrefix "nextpnr-" rev) then rev else "nextpnr-${rev}";
+  in ["-DCURRENT_GIT_VERSION=${version}"
       "-DARCH=generic;ice40;ecp5;gowin;himbaechel"
       "-DBUILD_TESTS=ON"
       "-DICESTORM_INSTALL_PREFIX=${icestorm}"