From c7e026bec483582bf2b8ac624519555f9476751c Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Mon, 29 Oct 2018 18:25:59 +0100
Subject: [PATCH] make-derivation: use `lib.assertMsg`

As suggested by @Profpatsch
---
 pkgs/stdenv/generic/make-derivation.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 9f6fee93710..2ff7db947fe 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -83,8 +83,10 @@ rec {
     , ... } @ attrs:
 
     # Check that the name is consistent with pname and version:
-    assert lib.lists.all (name: builtins.hasAttr name attrs) ["name" "pname" "version"]
-      -> lib.strings.hasSuffix "${attrs.pname}-${attrs.version}" attrs.name;
+    assert lib.assertMsg
+      (lib.lists.all (name: builtins.hasAttr name attrs) ["name" "pname" "version"]
+        -> lib.strings.hasSuffix "${attrs.pname}-${attrs.version}" attrs.name)
+      "mkDerivation: `name` must be consistent with `pname-version`";
 
     let
       # TODO(@oxij, @Ericson2314): This is here to keep the old semantics, remove when