summary refs log tree commit diff
path: root/pkgs/stdenv/generic
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2023-04-14 11:22:20 +0200
committerGitHub <noreply@github.com>2023-04-14 11:22:20 +0200
commitb04d4bad2783416c587c45528ccc763c7910ff07 (patch)
tree1c471a07f535d6a1e67a1d7115a15c6b1e69e68e /pkgs/stdenv/generic
parent6ed78f017cd0bdc4cb21ffaf77d15a471cf546dc (diff)
parent7090651071c9fb91da728183374d515f0894e37c (diff)
downloadnixpkgs-b04d4bad2783416c587c45528ccc763c7910ff07.tar
nixpkgs-b04d4bad2783416c587c45528ccc763c7910ff07.tar.gz
nixpkgs-b04d4bad2783416c587c45528ccc763c7910ff07.tar.bz2
nixpkgs-b04d4bad2783416c587c45528ccc763c7910ff07.tar.lz
nixpkgs-b04d4bad2783416c587c45528ccc763c7910ff07.tar.xz
nixpkgs-b04d4bad2783416c587c45528ccc763c7910ff07.tar.zst
nixpkgs-b04d4bad2783416c587c45528ccc763c7910ff07.zip
Merge pull request #216992 from SuperSandro2000/stdenvNative-fix-eval
{bintools,cc}-wrapper: don't fallback to version = null 
Diffstat (limited to 'pkgs/stdenv/generic')
-rw-r--r--pkgs/stdenv/generic/make-derivation.nix6
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 50d4b58615b..6cb494d46e5 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -309,6 +309,7 @@ else let
           hostSuffix = lib.optionalString
             (stdenv.hostPlatform != stdenv.buildPlatform && !dontAddHostSuffix)
             "-${stdenv.hostPlatform.config}";
+
           # Disambiguate statically built packages. This was originally
           # introduce as a means to prevent nix-env to get confused between
           # nix and nixStatic. This should be also achieved by moving the
@@ -319,7 +320,10 @@ else let
         lib.strings.sanitizeDerivationName (
           if attrs ? name
           then attrs.name + hostSuffix
-          else "${attrs.pname}${staticMarker}${hostSuffix}-${attrs.version}"
+          else
+            # we cannot coerce null to a string below
+            assert lib.assertMsg (attrs ? version && attrs.version != null) "The ‘version’ attribute cannot be null.";
+            "${attrs.pname}${staticMarker}${hostSuffix}-${attrs.version}"
         );
     }) // lib.optionalAttrs __structuredAttrs { env = checkedEnv; } // {
       builder = attrs.realBuilder or stdenv.shell;