Clean up nix expressions

nix/docs.nix

@@ -17,14 +17,14 @@ stdenvNoCC.mkDerivation {
   ];
 
   buildPhase = let
-    properties = writeText "sqlite.properties" ''
+    sqliteProperties = writeText "sqlite.properties" ''
       description=SQLite
       driver=org.sqlite.JDBC
       driverPath=${sqlite-jdbc}/share/java/sqlite-jdbc-3.25.2.jar
       connectionSpec=jdbc:sqlite:<db>
     '';
 
-    args = writeText "schemaspy.properties" ''
+    schemaspyProperties = writeText "schemaspy.properties" ''
       schemaspy.cat="%"
       schemaspy.t=sqlite
       schemaspy.sso=true
@@ -37,17 +37,17 @@ stdenvNoCC.mkDerivation {
     runHook preBuild
 
     sqlite3 jadb.sqlite ".schema" > schema.sql
-    cp ${args} ./schemaspy.properties
-    schemaspy -t ${properties}
+    cp "${schemaspyProperties}" ./schemaspy.properties
+    schemaspy -t "${sqliteProperties}"
 
     runHook postBuild
   '';
 
   installPhase = ''
-    runHook preBuild
+    runHook preInstall
 
-    cp -r docs $out
+    cp -r docs "$out"
 
-    runHook postBuild
+    runHook postInstall
   '';
-}
+}

nix/jmdict.nix

@@ -22,8 +22,8 @@ stdenvNoCC.mkDerivation {
   buildPhase = ''
     runHook preBuild
 
-    gzip -dkc ${jmdict-src} > JMdict.xml
-    gzip -dkc ${jmdict-with-examples-src} > JMdict_with_examples.xml
+    gzip -dkc "${jmdict-src}" > JMdict.xml
+    gzip -dkc "${jmdict-with-examples-src}" > JMdict_with_examples.xml
     xmlformat -i JMdict.xml
     xmlformat -i JMdict_with_examples.xml
 
@@ -33,7 +33,7 @@ stdenvNoCC.mkDerivation {
   installPhase = ''
     runHook preInstall
 
-    install -Dt $out JMdict.xml JMdict_with_examples.xml
+    install -Dt "$out" JMdict.xml JMdict_with_examples.xml
 
     runHook postInstall
   '';
@@ -42,4 +42,4 @@ stdenvNoCC.mkDerivation {
     description = "A Japanese-Multilingual Dictionary providing lexical data for japanese words";
     homepage = "https://www.edrdg.org/jmdict/j_jmdict.html";
   };
-}
+}

nix/kanjidic2.nix

@@ -18,8 +18,8 @@ stdenvNoCC.mkDerivation {
   buildPhase = ''
     runHook preBuild
 
-    gzip -dkc ${kanjidic2-src} > kanjidic2.xml
-    # xmlformat -i kanjidic2.xml
+    gzip -dkc "${kanjidic2-src}" > kanjidic2.xml
+    xmlformat -i kanjidic2.xml
 
     runHook postBuild
   '';
@@ -27,13 +27,13 @@ stdenvNoCC.mkDerivation {
   installPhase = ''
     runHook preInstall
 
-    install -Dt $out kanjidic2.xml
+    install -Dt "$out" kanjidic2.xml
 
     runHook postInstall
   '';
 
   meta = edrdgMetadata // {
-    # description = "A Japanese-Multilingual Dictionary providing lexical data for japanese words";
-    # homepage = "https://www.edrdg.org/jmdict/j_jmdict.html";
+    description = "A consolidated XML-format kanji database";
+    homepage = "https://www.edrdg.org/kanjidic/kanjd2index_legacy.html";
   };
-}
+}

nix/radkfile.nix

@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   buildPhase = ''
     runHook preBuild
 
-    gzip -dkc $src > radkfile
+    gzip -dkc "$src" > radkfile
     iconv -f EUC-JP -t UTF-8 -o radkfile_utf8 radkfile
 
     runHook postBuild
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
   installPhase = ''
     runHook preInstall
 
-    install -Dt $out radkfile_utf8
+    install -Dt "$out" radkfile_utf8
 
     runHook postInstall
   '';
@@ -36,4 +36,4 @@ stdenv.mkDerivation {
     description = "A file providing searchable decompositions of kanji characters";
     homepage = "https://www.edrdg.org/krad/kradinf.html";
   };
-}
+}