8 files changed, 16 insertions, 8 deletions
diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix
index b66257f442ea..1b2425fa71a7 100644
--- a/pkgs/tools/graphics/argyllcms/default.nix
+++ b/pkgs/tools/graphics/argyllcms/default.nix
@@ -5,7 +5,8 @@ let
   version = "2.1.1";
  in
 stdenv.mkDerivation rec {
-  name = "argyllcms-${version}";
+  pname = "argyllcms";
+  inherit version;
 
   src = fetchzip {
     # Kind of flacky URL, it was reaturning 406 and inconsistent binaries for a
diff --git a/pkgs/tools/graphics/briss/default.nix b/pkgs/tools/graphics/briss/default.nix
index 57a6c8c9673c..e57f80f738f3 100644
--- a/pkgs/tools/graphics/briss/default.nix
+++ b/pkgs/tools/graphics/briss/default.nix
@@ -8,7 +8,8 @@ let
   sha256 = "45dd668a9ceb9cd59529a9fefe422a002ee1554a61be07e6fc8b3baf33d733d9";
 
 in stdenv.mkDerivation {
-  name = "briss-${version}";
+  pname = "briss";
+  inherit version;
   src = fetchurl {
     url = "mirror://sourceforge/briss/briss-${version}.tar.gz";
     inherit sha256;
diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix
index 51212a3ea946..848d804bb385 100644
--- a/pkgs/tools/graphics/gmic/default.nix
+++ b/pkgs/tools/graphics/gmic/default.nix
@@ -13,7 +13,8 @@ let
     sha256 = "0lv5jrg98cpbk13fl4xm7l4sk1axfz054q570bpi741w815d7cpg";
   };
 in stdenv.mkDerivation rec {
-  name = "gmic-${version}";
+  pname = "gmic";
+  inherit version;
 
   outputs = [ "out" "lib" "dev" "man" ] ++ stdenv.lib.optional withGimpPlugin "gimpPlugin";
 
diff --git a/pkgs/tools/graphics/gmic_krita_qt/default.nix b/pkgs/tools/graphics/gmic_krita_qt/default.nix
index 7ea73ab8db8d..e5bdf6f31775 100644
--- a/pkgs/tools/graphics/gmic_krita_qt/default.nix
+++ b/pkgs/tools/graphics/gmic_krita_qt/default.nix
@@ -7,7 +7,8 @@ let
   version = "2.3.6";
 
 in stdenv.mkDerivation rec {
-  name = "gmic_krita_qt-${version}";
+  pname = "gmic_krita_qt";
+  inherit version;
 
   gmic-community = fetchFromGitHub {
     owner = "dtschump";
diff --git a/pkgs/tools/graphics/graphviz/base.nix b/pkgs/tools/graphics/graphviz/base.nix
index db21df9b5d0d..6cdd6dd71c1d 100644
--- a/pkgs/tools/graphics/graphviz/base.nix
+++ b/pkgs/tools/graphics/graphviz/base.nix
@@ -25,7 +25,8 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "graphviz-${version}";
+  pname = "graphviz";
+  inherit version;
 
   src = fetchFromGitLab {
     owner = "graphviz";
diff --git a/pkgs/tools/graphics/mscgen/default.nix b/pkgs/tools/graphics/mscgen/default.nix
index 666cdae131e2..832a48baab72 100644
--- a/pkgs/tools/graphics/mscgen/default.nix
+++ b/pkgs/tools/graphics/mscgen/default.nix
@@ -4,7 +4,8 @@ let
   version = "0.20";
 in
 stdenv.mkDerivation {
-  name = "mscgen-${version}";
+  pname = "mscgen";
+  inherit version;
 
   src = fetchurl {
     url = "http://www.mcternan.me.uk/mscgen/software/mscgen-src-${version}.tar.gz";
diff --git a/pkgs/tools/graphics/pgf/default.nix b/pkgs/tools/graphics/pgf/default.nix
index c91c18e3f0b6..b65962ee7ba2 100644
--- a/pkgs/tools/graphics/pgf/default.nix
+++ b/pkgs/tools/graphics/pgf/default.nix
@@ -6,7 +6,8 @@ let
   version = "6.14.12";
 in
 stdenv.mkDerivation {
-  name = "pgf-${version}";
+  pname = "pgf";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/libpgf/pgf-console-src-${version}.tar.gz";
diff --git a/pkgs/tools/graphics/twilight/default.nix b/pkgs/tools/graphics/twilight/default.nix
index 3769860d469b..42a86187a72d 100644
--- a/pkgs/tools/graphics/twilight/default.nix
+++ b/pkgs/tools/graphics/twilight/default.nix
@@ -4,7 +4,8 @@
 let
   version = "2018-04-19";
 in stdenv.mkDerivation rec {
-  name = "twilight-${version}";
+  pname = "twilight";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "tweakoz";