summary refs log tree commit diff
path: root/pkgs/tools/X11
diff options
context:
space:
mode:
authorvolth <volth@volth.com>2019-08-13 21:52:01 +0000
committervolth <volth@volth.com>2019-08-17 10:54:38 +0000
commitc814d72b517bb201c8bbbfc64e386c7023352886 (patch)
tree3a7b3bb7326a2087a34e5333aa8dbc367ec2deb1 /pkgs/tools/X11
parentfe9a3e3e63fa59c8014d454b0efd3231bdd19350 (diff)
downloadnixpkgs-c814d72b517bb201c8bbbfc64e386c7023352886.tar
nixpkgs-c814d72b517bb201c8bbbfc64e386c7023352886.tar.gz
nixpkgs-c814d72b517bb201c8bbbfc64e386c7023352886.tar.bz2
nixpkgs-c814d72b517bb201c8bbbfc64e386c7023352886.tar.lz
nixpkgs-c814d72b517bb201c8bbbfc64e386c7023352886.tar.xz
nixpkgs-c814d72b517bb201c8bbbfc64e386c7023352886.tar.zst
nixpkgs-c814d72b517bb201c8bbbfc64e386c7023352886.zip
treewide: name -> pname
Diffstat (limited to 'pkgs/tools/X11')
-rw-r--r--pkgs/tools/X11/bumblebee/default.nix5
-rw-r--r--pkgs/tools/X11/nitrogen/default.nix5
-rw-r--r--pkgs/tools/X11/xautomation/default.nix3
-rw-r--r--pkgs/tools/X11/xbindkeys/default.nix3
-rw-r--r--pkgs/tools/X11/xwinwrap/default.nix3
5 files changed, 12 insertions, 7 deletions
diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix
index 0d764a4cbd1..f5a8fd24f5e 100644
--- a/pkgs/tools/X11/bumblebee/default.nix
+++ b/pkgs/tools/X11/bumblebee/default.nix
@@ -56,10 +56,11 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "bumblebee-${version}";
+  pname = "bumblebee";
+  inherit version;
 
   src = fetchurl {
-    url = "https://bumblebee-project.org/${name}.tar.gz";
+    url = "https://bumblebee-project.org/${pname}-${version}.tar.gz";
     sha256 = "03p3gvx99lwlavznrpg9l7jnl1yfg2adcj8jcjj0gxp20wxp060h";
   };
 
diff --git a/pkgs/tools/X11/nitrogen/default.nix b/pkgs/tools/X11/nitrogen/default.nix
index eda5703d6a8..95aa15840da 100644
--- a/pkgs/tools/X11/nitrogen/default.nix
+++ b/pkgs/tools/X11/nitrogen/default.nix
@@ -3,10 +3,11 @@
 let version = "1.6.1";
 in
 stdenv.mkDerivation rec {
-  name = "nitrogen-${version}";
+  pname = "nitrogen";
+  inherit version;
 
   src = fetchurl {
-    url = "http://projects.l3ib.org/nitrogen/files/${name}.tar.gz";
+    url = "http://projects.l3ib.org/nitrogen/files/${pname}-${version}.tar.gz";
     sha256 = "0zc3fl1mbhq0iyndy4ysmy8vv5c7xwf54rbgamzfhfvsgdq160pl";
   };
 
diff --git a/pkgs/tools/X11/xautomation/default.nix b/pkgs/tools/X11/xautomation/default.nix
index 79ef4cb56dc..a648eefcdde 100644
--- a/pkgs/tools/X11/xautomation/default.nix
+++ b/pkgs/tools/X11/xautomation/default.nix
@@ -2,7 +2,8 @@
 
 let version = "1.09"; in
 stdenv.mkDerivation {
-  name = "xautomation-${version}";
+  pname = "xautomation";
+  inherit version;
   src = fetchurl {
     url = "https://www.hoopajoo.net/static/projects/xautomation-${version}.tar.gz";
     sha256 = "03azv5wpg65h40ip2kk1kdh58vix4vy1r9bihgsq59jx2rhjr3zf";
diff --git a/pkgs/tools/X11/xbindkeys/default.nix b/pkgs/tools/X11/xbindkeys/default.nix
index 4e4e49bd946..23e0ce63e5b 100644
--- a/pkgs/tools/X11/xbindkeys/default.nix
+++ b/pkgs/tools/X11/xbindkeys/default.nix
@@ -2,7 +2,8 @@
 
 let version = "1.8.6"; in
 stdenv.mkDerivation {
-  name = "xbindkeys-${version}";
+  pname = "xbindkeys";
+  inherit version;
   src = fetchurl {
     url = "https://www.nongnu.org/xbindkeys/xbindkeys-${version}.tar.gz";
     sha256 = "060df6d8y727jp1inp7blp44cs8a7jig7vcm8ndsn6gw36z1h3bc";
diff --git a/pkgs/tools/X11/xwinwrap/default.nix b/pkgs/tools/X11/xwinwrap/default.nix
index dbbdb0c04e9..b9d48f54574 100644
--- a/pkgs/tools/X11/xwinwrap/default.nix
+++ b/pkgs/tools/X11/xwinwrap/default.nix
@@ -4,7 +4,8 @@ let
   version = "4";
 in
 stdenv.mkDerivation {
-  name = "xwinwrap-${version}";
+  pname = "xwinwrap";
+  inherit version;
 
   src = fetchbzr {
     url = https://code.launchpad.net/~shantanu-goel/xwinwrap/devel;