10 files changed, 66 insertions, 34 deletions
diff --git a/pkgs/tools/X11/imwheel/default.nix b/pkgs/tools/X11/imwheel/default.nix
index 27a545a95cd..7aa8a6cba6a 100644
--- a/pkgs/tools/X11/imwheel/default.nix
+++ b/pkgs/tools/X11/imwheel/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, libX11, libXext, libXi, libXmu, libXt, libXtst }:
 
 stdenv.mkDerivation rec {
-  name = "imwheel-1.0.0pre12";
+  pname = "imwheel";
+  version = "1.0.0pre12";
 
   src = fetchurl {
-    url = "mirror://sourceforge/imwheel/${name}.tar.gz";
+    url = "mirror://sourceforge/imwheel/imwheel-${version}.tar.gz";
     sha256 = "2320ed019c95ca4d922968e1e1cbf0c075a914e865e3965d2bd694ca3d57cfe3";
   };
 
diff --git a/pkgs/tools/X11/keynav/default.nix b/pkgs/tools/X11/keynav/default.nix
index 75b5bc2356a..847d13315f8 100644
--- a/pkgs/tools/X11/keynav/default.nix
+++ b/pkgs/tools/X11/keynav/default.nix
@@ -1,9 +1,23 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, libX11, xorgproto, libXtst, libXi, libXext
-, libXinerama, libXrandr, glib, cairo, xdotool }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, pkg-config
+, libX11
+, xorgproto
+, libXtst
+, libXi
+, libXext
+, libXinerama
+, libXrandr
+, glib
+, cairo
+, xdotool
+}:
 
 let release = "20180821"; in
 stdenv.mkDerivation {
-  name = "keynav-0.${release}.0";
+  pname = "keynav";
+  version = "0.${release}.0";
 
   src = fetchFromGitHub {
     owner = "jordansissel";
@@ -13,21 +27,30 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ libX11 xorgproto libXtst libXi libXext libXinerama libXrandr
-                  glib cairo xdotool ];
+  buildInputs = [
+    libX11
+    xorgproto
+    libXtst
+    libXi
+    libXext
+    libXinerama
+    libXrandr
+    glib
+    cairo
+    xdotool
+  ];
 
-  patchPhase = ''
+  postPatch = ''
     echo >>VERSION MAJOR=0
     echo >>VERSION RELEASE=${release}
     echo >>VERSION REVISION=0
   '';
 
-  installPhase =
-    ''
-      mkdir -p $out/bin $out/share/keynav/doc
-      cp keynav $out/bin
-      cp keynavrc $out/share/keynav/doc
-    '';
+  installPhase = ''
+    mkdir -p $out/bin $out/share/keynav/doc
+    cp keynav $out/bin
+    cp keynavrc $out/share/keynav/doc
+  '';
 
   meta = with lib; {
     description = "Generate X11 mouse clicks from keyboard";
diff --git a/pkgs/tools/X11/x2vnc/default.nix b/pkgs/tools/X11/x2vnc/default.nix
index 10519128a9d..ed4a83fc8de 100644
--- a/pkgs/tools/X11/x2vnc/default.nix
+++ b/pkgs/tools/X11/x2vnc/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, xorg }:
 
-stdenv.mkDerivation {
-  name = "x2vnc-1.7.2";
+stdenv.mkDerivation rec {
+  pname = "x2vnc";
+  version = "1.7.2";
 
   src = fetchurl {
-    url = "https://fredrik.hubbe.net/x2vnc/x2vnc-1.7.2.tar.gz";
+    url = "https://fredrik.hubbe.net/x2vnc/x2vnc-${version}.tar.gz";
     sha256 = "00bh9j3m6snyd2fgnzhj5vlkj9ibh69gfny9bfzlxbnivb06s1yw";
   };
 
diff --git a/pkgs/tools/X11/x2x/default.nix b/pkgs/tools/X11/x2x/default.nix
index 01169e68f6e..f473344ad38 100644
--- a/pkgs/tools/X11/x2x/default.nix
+++ b/pkgs/tools/X11/x2x/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, imake, libX11, libXtst, libXext, gccmakedep }:
 
-stdenv.mkDerivation {
-  name = "x2x-1.27";
+stdenv.mkDerivation rec {
+  pname = "x2x";
+  version = "1.27";
 
   src = fetchurl {
-    url = "https://github.com/downloads/dottedmag/x2x/x2x-1.27.tar.gz";
+    url = "https://github.com/downloads/dottedmag/x2x/x2x-${version}.tar.gz";
     sha256 = "0dha0kn1lbc4as0wixsvk6bn4innv49z9a0sm5wlx4q1v0vzqzyj";
   };
 
diff --git a/pkgs/tools/X11/xbrightness/default.nix b/pkgs/tools/X11/xbrightness/default.nix
index 1bb95699f64..1445c60ccb1 100644
--- a/pkgs/tools/X11/xbrightness/default.nix
+++ b/pkgs/tools/X11/xbrightness/default.nix
@@ -1,11 +1,12 @@
 { lib, stdenv, fetchurl, imake, gccmakedep
 , libX11, libXaw, libXext, libXmu, libXpm, libXxf86vm  }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
+  pname = "xbrightness";
+  version = "0.3-mika-akk";
 
-  name = "xbrightness-0.3-mika-akk";
   src = fetchurl {
-    url = "https://shallowsky.com/software/xbrightness/xbrightness-0.3-mika-akk.tar.gz";
+    url = "https://shallowsky.com/software/xbrightness/xbrightness-${version}.tar.gz";
     sha256 = "2564dbd393544657cdabe4cbf535d9cfb9abe8edddb1b8cdb1ed4d12f358626e";
   };
 
diff --git a/pkgs/tools/X11/xcalib/default.nix b/pkgs/tools/X11/xcalib/default.nix
index 78804d02791..09d5cde88fe 100644
--- a/pkgs/tools/X11/xcalib/default.nix
+++ b/pkgs/tools/X11/xcalib/default.nix
@@ -1,12 +1,13 @@
 { lib, stdenv, fetchFromGitHub, libX11, libXxf86vm, libXext, libXrandr }:
 
 stdenv.mkDerivation rec {
-  name = "xcalib-0.10";
+  pname = "xcalib";
+  version = "0.10";
 
   src = fetchFromGitHub {
     owner = "OpenICC";
     repo = "xcalib";
-    rev = "f95abc1a551d7c695a8b142c4d9d5035368d482d";
+    rev = version;
     sha256 = "05fzdjmhiafgi2jf0k41i3nm0837a78sb6yv59cwc23nla8g0bhr";
   };
 
diff --git a/pkgs/tools/X11/xchainkeys/default.nix b/pkgs/tools/X11/xchainkeys/default.nix
index 06428393b2a..5c154f8a111 100644
--- a/pkgs/tools/X11/xchainkeys/default.nix
+++ b/pkgs/tools/X11/xchainkeys/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, libX11 }:
 
 stdenv.mkDerivation rec {
-  name = "xchainkeys-0.11";
+  pname = "xchainkeys";
+  version = "0.11";
 
   src = fetchurl {
-    url = "http://henning-bekel.de/download/xchainkeys/${name}.tar.gz";
+    url = "http://henning-bekel.de/download/xchainkeys/xchainkeys-${version}.tar.gz";
     sha256 = "1rpqs7h5krral08vqxwb0imy33z17v5llvrg5hy8hkl2ap7ya0mn";
   };
 
diff --git a/pkgs/tools/X11/xdg-user-dirs/default.nix b/pkgs/tools/X11/xdg-user-dirs/default.nix
index 991b9be2238..a5eb5e0ee0a 100644
--- a/pkgs/tools/X11/xdg-user-dirs/default.nix
+++ b/pkgs/tools/X11/xdg-user-dirs/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, libxslt, docbook_xsl, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "xdg-user-dirs-0.17";
+  pname = "xdg-user-dirs";
+  version = "0.17";
 
   src = fetchurl {
-    url = "https://user-dirs.freedesktop.org/releases/${name}.tar.gz";
+    url = "https://user-dirs.freedesktop.org/releases/xdg-user-dirs-${version}.tar.gz";
     sha256 = "13216b8rfkzak5k6bvpx6jvqv3cnbgpijnjwj8a8d3kq4cl0a1ra";
   };
 
diff --git a/pkgs/tools/X11/xkbset/default.nix b/pkgs/tools/X11/xkbset/default.nix
index 132b7a11122..31bcfc10d6d 100644
--- a/pkgs/tools/X11/xkbset/default.nix
+++ b/pkgs/tools/X11/xkbset/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, perl, libX11 }:
 
 stdenv.mkDerivation rec {
-  name = "xkbset-0.5";
+  pname = "xkbset";
+  version = "0.5";
 
   src = fetchurl {
-    url = "http://faculty.missouri.edu/~stephen/software/xkbset/${name}.tar.gz";
+    url = "http://faculty.missouri.edu/~stephen/software/xkbset/xkbset-${version}.tar.gz";
     sha256 = "01c2579495b39e00d870f50225c441888dc88021e9ee3b693a842dd72554d172";
   };
 
diff --git a/pkgs/tools/X11/xmagnify/default.nix b/pkgs/tools/X11/xmagnify/default.nix
index b4df0f00342..a9cb715be39 100644
--- a/pkgs/tools/X11/xmagnify/default.nix
+++ b/pkgs/tools/X11/xmagnify/default.nix
@@ -1,12 +1,13 @@
 { lib, stdenv, fetchFromGitLab, libX11, xorgproto }:
 
-stdenv.mkDerivation {
-  name = "xmagnify-0.1.0";
+stdenv.mkDerivation rec {
+  pname = "xmagnify";
+  version = "0.1.0";
 
   src = fetchFromGitLab {
     owner = "amiloradovsky";
     repo = "magnify";
-    rev = "0.1.0";  # 56da280173e9d0bd7b3769e07ba485cb4db35869
+    rev = version;
     sha256 = "1ngnp5f5zl3v35vhbdyjpymy6mwrs0476fm5nd7dzkba7n841jdh";
   };