summary refs log tree commit diff
path: root/pkgs/desktops/gnome-3/misc
diff options
context:
space:
mode:
authorvolth <volth@volth.com>2019-08-15 12:41:18 +0000
committerJörg Thalheim <Mic92@users.noreply.github.com>2019-08-15 13:41:18 +0100
commit46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6 (patch)
tree46b871987347acf0215f8a9bf54df275aed9c496 /pkgs/desktops/gnome-3/misc
parentcff9e6429a4341e924594f5e057b03ca8101b314 (diff)
downloadnixpkgs-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar
nixpkgs-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar.gz
nixpkgs-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar.bz2
nixpkgs-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar.lz
nixpkgs-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar.xz
nixpkgs-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar.zst
nixpkgs-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.zip
treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
Diffstat (limited to 'pkgs/desktops/gnome-3/misc')
-rw-r--r--pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix4
-rw-r--r--pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix4
-rw-r--r--pkgs/desktops/gnome-3/misc/gpaste/default.nix4
-rw-r--r--pkgs/desktops/gnome-3/misc/gtkhtml/default.nix4
4 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix
index c80c8b977cf..c8d26988391 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-autoar-${version}";
+  pname = "gnome-autoar";
   version = "0.2.3";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-autoar/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-autoar/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "02i4zgqqqj56h7bcys6dz7n78m4nj2x4dv1ggjmnrk98n06xpsax";
   };
 
diff --git a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix
index d819961d281..ea9a79de40e 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix
@@ -2,11 +2,11 @@
 , gtk3, systemd, wrapGAppsHook, desktop-file-utils, hicolor-icon-theme }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-packagekit-${version}";
+  pname = "gnome-packagekit";
   version = "3.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-packagekit/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-packagekit/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "08rhsisdvx7pnx3rrg5v7c09jbw4grglkdj979gwl4a31j24zjsd";
   };
 
diff --git a/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/misc/gpaste/default.nix
index a35067587e0..d8a78686e49 100644
--- a/pkgs/desktops/gnome-3/misc/gpaste/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gpaste/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "3.32.0";
-  name = "gpaste-${version}";
+  pname = "gpaste";
 
   src = fetchurl {
     url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     substituteInPlace src/gnome-shell/prefs.js \
       --subst-var-by typelibPath "${placeholder "out"}/lib/girepository-1.0"
     substituteInPlace src/libgpaste/settings/gpaste-settings.c \
-      --subst-var-by gschemasCompiled "${placeholder "out"}/share/gsettings-schemas/${name}/glib-2.0/schemas"
+      --subst-var-by gschemasCompiled "${placeholder "out"}/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas"
   '';
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix
index 543453a2bd3..a607a6eb6a0 100644
--- a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix
@@ -2,11 +2,11 @@
 , gnome3, enchant, isocodes, gsettings-desktop-schemas }:
 
 stdenv.mkDerivation rec {
-  name = "gtkhtml-${version}";
+  pname = "gtkhtml";
   version = "4.10.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gtkhtml/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gtkhtml/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "ca3b6424fb2c7ac5d9cb8fdafb69318fa2e825c9cf6ed17d1e38d9b29e5606c3";
   };