From ea9d993324987a134ca6b93fbafe9c64010b623e Mon Sep 17 00:00:00 2001
From: puttaalu <ashik@inflo.ws>
Date: Sat, 12 Oct 2024 17:53:10 +0200
Subject: [PATCH] update and fix flake build

---
 anjali-old-lipi/default.nix | 13 +++++--------
 chilanka/default.nix        | 13 +++++--------
 default.nix                 |  9 ++++-----
 flake.lock                  | 34 ++++++++++++++++++++++++++++++++++
 flake.nix                   | 32 +++++++++++++++++++++++---------
 manjari/default.nix         | 14 +++++---------
 6 files changed, 76 insertions(+), 39 deletions(-)

diff --git a/anjali-old-lipi/default.nix b/anjali-old-lipi/default.nix
index 3f363c7..79ebdc6 100644
--- a/anjali-old-lipi/default.nix
+++ b/anjali-old-lipi/default.nix
@@ -1,21 +1,18 @@
-{ pkgs, ...}:
+{ pkgs, ... }:
 
 pkgs.stdenv.mkDerivation {
   version = "7.1";
   pname = "anjali-old-lipi";
-  
+
   src = pkgs.fetchzip {
     url = "https://smc.org.in/downloads/fonts/anjalioldlipi/anjalioldlipi.zip";
-    hash = "sha256-yqlTyoDQPKmH/ssTSrQPZEqFiuN+pvZyGLggiQWoa/M=s";
+    hash = "sha256-c3ScpdN2h39Q6GLFL97pBBGrsillcMXmhlGilOAdF1w=";
     stripRoot = false;
   };
 
-  
   installPhase = ''
-      runHook preInstall
-      install -Dm444 -t $out/share/fonts/truetype $src/*.ttf
-      runHook postInstall                
- '';
+    install -Dm444 -t $out/share/fonts/truetype $src/*.ttf
+  '';
 
   meta = with pkgs.lib; {
     homepage = "https://smc.org.in/fonts/manjari";
diff --git a/chilanka/default.nix b/chilanka/default.nix
index 9cbd4cb..8eb59ee 100644
--- a/chilanka/default.nix
+++ b/chilanka/default.nix
@@ -1,21 +1,18 @@
-{ pkgs, ...}:
+{ pkgs, ... }:
 
 pkgs.stdenv.mkDerivation {
   version = "1.7";
   pname = "chilanka";
-  
+
   src = pkgs.fetchzip {
     url = "https://smc.org.in/downloads/fonts/chilanka/chilanka.zip";
-    hash = "sha256-u3hUW6EFhr9FIUl28u7TUKEclxWcpK95OUmL+SCwkD0=s";
+    hash = "sha256-z+pRvm/8alA3TbUBuR4oDD/kpvuXJTqOBlzXEKBZvnE=";
     stripRoot = false;
   };
 
-  
   installPhase = ''
-      runHook preInstall
-      install -Dm444 -t $out/share/fonts/truetype $src/*.ttf
-      runHook postInstall                
- '';
+    install -Dm444 -t $out/share/fonts/truetype $src/*.ttf
+  '';
 
   meta = with pkgs.lib; {
     homepage = "https://smc.org.in/fonts/chilanka";
diff --git a/default.nix b/default.nix
index b58fb1d..dfa07fc 100644
--- a/default.nix
+++ b/default.nix
@@ -1,8 +1,7 @@
-{ pkgs,... }:
-
+{ pkgs, ... }:
 
 {
-  manjari = pkgs.callPackage ./manjari {};
-  anjali-old-lipi = pkgs.callPackage ./anjali-old-lipi {};
-  chilanka = pkgs.callPackage ./chilanka {};
+  manjari = pkgs.callPackage ./manjari { };
+  anjali-old-lipi = pkgs.callPackage ./anjali-old-lipi { };
+  chilanka = pkgs.callPackage ./chilanka { };
 }
diff --git a/flake.lock b/flake.lock
index 5893709..07cac77 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,23 @@
 {
   "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1726560853,
+        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1721924956,
@@ -18,8 +36,24 @@
     },
     "root": {
       "inputs": {
+        "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs"
       }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index f21b139..30f3f52 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,16 +3,30 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-   
+    flake-utils.url = "github:numtide/flake-utils";
   };
 
-  outputs = { self, nixpkgs }:{
+  outputs = inputs:
+    with inputs;
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        pkgs = nixpkgs.legacyPackages.${system};
+        font-smc-manjari = pkgs.callPackage ./manjari/default.nix { };
+        font-smc-anjali-old-lipi =
+          pkgs.callPackage ./anjali-old-lipi/default.nix { };
+        font-smc-chilanka = pkgs.callPackage ./chilanka/default.nix { };
+      in rec {
+        packages = {
+          smc-anjali-old-lipi = font-smc-anjali-old-lipi;
+          smc-manjari = font-smc-manjari;
+          smc-chilanka = font-smc-chilanka;
 
-    packages.x86_64-linux =   let
-      pkgs = import nixpkgs { system = "x86_64-linux";};
-    in {
-      smcFonts = import ./default.nix { inherit pkgs; };
-      default = self.packages.x86_64-linux.smcFonts.chilanka;
-    };
-  };
+          all = pkgs.symlinkJoin {
+            name = "all";
+            paths =
+              [ font-smc-anjali-old-lipi font-smc-chilanka font-smc-manjari ];
+          };
+          default = packages.all;
+        };
+      });
 }
diff --git a/manjari/default.nix b/manjari/default.nix
index a1d6fb4..798c3f7 100644
--- a/manjari/default.nix
+++ b/manjari/default.nix
@@ -1,22 +1,18 @@
-{ pkgs, ...}:
+{ pkgs, ... }:
 
 pkgs.stdenv.mkDerivation {
   version = "2.200";
   pname = "manjari";
-  
+
   src = pkgs.fetchzip {
     url = "https://smc.org.in/downloads/fonts/manjari/manjari.zip";
-    hash = "sha256-u3hUW6EFhr9FIUl28u7TUKEclxWcpK95OUmL+SCwkD0=";
+    hash = "sha256-Sq/7UOBO54c3id6FMZeOmnZTRceEkMAAN8W+C7v7Mtw=";
     stripRoot = false;
   };
 
-  
   installPhase = ''
-      runHook preInstall
-      install -Dm444 -t $out/share/fonts/opentype $src/*.otf
-      install -Dm444 -t $out/share/fonts/truetype $src/*.ttf
-      runHook postInstall                
- '';
+    install -Dm444 -t $out/share/fonts/opentype $src/*.otf
+  '';
 
   meta = with pkgs.lib; {
     homepage = "https://smc.org.in/fonts/manjari";