From 1f7fc09176dc9b0260b8e2778f1e6c3139eae6a9 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Tue, 30 Oct 2018 14:27:28 +0100
Subject: make-derivation: use a more descriptive assert message

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

(limited to 'pkgs')

diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 2ff7db947fe0..cb3731da1934 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -86,7 +86,8 @@ rec {
     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`";
+      ("mkDerivation: `name` (\"${attrs.name}\") must be consistent " +
+       "with `pname-version` \"${attrs.pname}-${attrs.version}\"");
 
     let
       # TODO(@oxij, @Ericson2314): This is here to keep the old semantics, remove when
-- 
cgit 1.4.1