From e7592807fbf296990b6ced9ebb86881eb154ebcc Mon Sep 17 00:00:00 2001
From: Candy Cloud <candyc1oud@outlook.com>
Date: Fri, 16 Dec 2022 13:01:52 +0000
Subject: [PATCH 1/2] smiley-sans: init at 1.0.0

---
 pkgs/data/fonts/smiley-sans/default.nix | 33 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/data/fonts/smiley-sans/default.nix

diff --git a/pkgs/data/fonts/smiley-sans/default.nix b/pkgs/data/fonts/smiley-sans/default.nix
new file mode 100644
index 000000000000..71dda0b34b2c
--- /dev/null
+++ b/pkgs/data/fonts/smiley-sans/default.nix
@@ -0,0 +1,33 @@
+{ lib, stdenvNoCC, fetchurl, unzip }:
+
+stdenvNoCC.mkDerivation rec {
+  pname = "smiley-sans";
+  version = "1.0.0";
+
+  src = fetchurl {
+    url = "https://github.com/atelier-anchor/smiley-sans/releases/download/v${version}/smiley-sans-v${version}.zip";
+    sha256 = "sha256-gpPJuf1Eye5rP6tpaGJEUFnk2Ys0GhSNRUT5HQE2P8E=";
+  };
+
+  unpackPhase = ''
+    ${unzip}/bin/unzip $src
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/share/fonts
+    install -Dm644 -t $out/share/fonts/opentype *.otf
+    install -Dm644 -t $out/share/fonts/truetype *.ttf
+    install -Dm644 -t $out/share/fonts/smiley-sans *.woff2
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "A condensed and oblique Chinese typeface seeking a visual balance between the humanist and the geometric";
+    homepage = "https://atelier-anchor.com/typefaces/smiley-sans/";
+    changelog = "https://github.com/atelier-anchor/smiley-sans/blob/main/CHANGELOG.md";
+    license = licenses.ofl;
+    maintainers = with maintainers; [ candyc1oud ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 439d7e9e9c7a..321f917dee34 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16226,6 +16226,8 @@ with pkgs;
 
   self = pkgsi686Linux.callPackage ../development/interpreters/self { };
 
+  smiley-sans = callPackage ../data/fonts/smiley-sans { };
+
   inherit (callPackages ../applications/networking/cluster/spark { })
     spark_3_2
     spark_3_1

From 558544c1b479a55975391a9b8e8ae4715ed393a5 Mon Sep 17 00:00:00 2001
From: Candy Cloud <candyc1oud@outlook.com>
Date: Sun, 18 Dec 2022 08:14:22 +0800
Subject: [PATCH 2/2] smiley-sans: improve code

---
 pkgs/data/fonts/smiley-sans/default.nix | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/data/fonts/smiley-sans/default.nix b/pkgs/data/fonts/smiley-sans/default.nix
index 71dda0b34b2c..3bef9608b46e 100644
--- a/pkgs/data/fonts/smiley-sans/default.nix
+++ b/pkgs/data/fonts/smiley-sans/default.nix
@@ -1,24 +1,20 @@
-{ lib, stdenvNoCC, fetchurl, unzip }:
+{ lib, stdenvNoCC, fetchzip }:
 
 stdenvNoCC.mkDerivation rec {
   pname = "smiley-sans";
   version = "1.0.0";
 
-  src = fetchurl {
+  src = fetchzip {
     url = "https://github.com/atelier-anchor/smiley-sans/releases/download/v${version}/smiley-sans-v${version}.zip";
-    sha256 = "sha256-gpPJuf1Eye5rP6tpaGJEUFnk2Ys0GhSNRUT5HQE2P8E=";
+    sha256 = "sha256-LE0CZkWiXjyuiEk316ABCNQL9n5GID8CipjBIu2o6uk=";
+    stripRoot = false;
   };
 
-  unpackPhase = ''
-    ${unzip}/bin/unzip $src
-  '';
-
   installPhase = ''
     runHook preInstall
-    mkdir -p $out/share/fonts
     install -Dm644 -t $out/share/fonts/opentype *.otf
     install -Dm644 -t $out/share/fonts/truetype *.ttf
-    install -Dm644 -t $out/share/fonts/smiley-sans *.woff2
+    install -Dm644 -t $out/share/fonts/woff2 *.woff2
     runHook postInstall
   '';