From 8ded3090feb453db9ffa433443531ce6894d9adc Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Thu, 12 Aug 2021 20:40:38 +0200
Subject: tools/inputmethods: replace name with pname&version

---
 pkgs/tools/inputmethods/anthy/default.nix    | 5 +++--
 pkgs/tools/inputmethods/m17n-db/default.nix  | 5 +++--
 pkgs/tools/inputmethods/m17n-lib/default.nix | 5 +++--
 pkgs/tools/inputmethods/nabi/default.nix     | 7 ++++---
 4 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'pkgs/tools/inputmethods')

diff --git a/pkgs/tools/inputmethods/anthy/default.nix b/pkgs/tools/inputmethods/anthy/default.nix
index 03c692de8ec..23e2da0e41e 100644
--- a/pkgs/tools/inputmethods/anthy/default.nix
+++ b/pkgs/tools/inputmethods/anthy/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "anthy-9100h";
+  pname = "anthy";
+  version = "9100h";
 
   meta = with lib; {
     description = "Hiragana text to Kana Kanji mixed text Japanese input method";
@@ -12,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "mirror://osdn/anthy/37536/${name}.tar.gz";
+    url = "mirror://osdn/anthy/37536/anthy-${version}.tar.gz";
     sha256 = "0ism4zibcsa5nl77wwi12vdsfjys3waxcphn1p5s7d0qy1sz0mnj";
   };
 }
diff --git a/pkgs/tools/inputmethods/m17n-db/default.nix b/pkgs/tools/inputmethods/m17n-db/default.nix
index 7feb14080e9..9344951dffe 100644
--- a/pkgs/tools/inputmethods/m17n-db/default.nix
+++ b/pkgs/tools/inputmethods/m17n-db/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "m17n-db-1.8.0";
+  pname = "m17n-db";
+  version = "1.8.0";
 
   src = fetchurl {
-    url = "https://download.savannah.gnu.org/releases/m17n/${name}.tar.gz";
+    url = "https://download.savannah.gnu.org/releases/m17n/m17n-db-${version}.tar.gz";
     sha256 = "0vfw7z9i2s9np6nmx1d4dlsywm044rkaqarn7akffmb6bf1j6zv5";
   };
 
diff --git a/pkgs/tools/inputmethods/m17n-lib/default.nix b/pkgs/tools/inputmethods/m17n-lib/default.nix
index 51e52ce4e95..c80f9736311 100644
--- a/pkgs/tools/inputmethods/m17n-lib/default.nix
+++ b/pkgs/tools/inputmethods/m17n-lib/default.nix
@@ -1,9 +1,10 @@
 {lib, stdenv, fetchurl, m17n_db}:
 stdenv.mkDerivation rec {
-  name = "m17n-lib-1.8.0";
+  pname = "m17n-lib";
+  version = "1.8.0";
 
   src = fetchurl {
-    url = "https://download.savannah.gnu.org/releases/m17n/${name}.tar.gz";
+    url = "https://download.savannah.gnu.org/releases/m17n/m17n-lib-${version}.tar.gz";
     sha256 = "0jp61y09xqj10mclpip48qlfhniw8gwy8b28cbzxy8hq8pkwmfkq";
   };
 
diff --git a/pkgs/tools/inputmethods/nabi/default.nix b/pkgs/tools/inputmethods/nabi/default.nix
index 5b6b0223a01..72f13d4eb2d 100644
--- a/pkgs/tools/inputmethods/nabi/default.nix
+++ b/pkgs/tools/inputmethods/nabi/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, pkg-config, gtk2, libhangul }:
 
-stdenv.mkDerivation {
-  name = "nabi-1.0.0";
+stdenv.mkDerivation rec {
+  pname = "nabi";
+  version = "1.0.0";
 
   src = fetchurl {
-    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/nabi/nabi-1.0.0.tar.gz";
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/nabi/nabi-${version}.tar.gz";
     sha256 = "0craa24pw7b70sh253arv9bg9sy4q3mhsjwfss3bnv5nf0xwnncw";
   };
 
-- 
cgit 1.4.1