From 8c6ab0e2d54c60279d8280c0d3e50d286930acc3 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Sat, 20 Dec 2025 01:09:04 +0900
Subject: [PATCH] Update flake to use bitsnpicas from nixpkgs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bits'N'Picas is available since nixpkgs 25.11:
https://github.com/NixOS/nixpkgs/commit/29ed443f2cf1a130ab60e4b249fa5d7cbd3158c6

Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/bf3287dac860542719fe7554e21e686108716879?narHash=sha256-kwaaguGkAqTZ1oK0yXeQ3ayYjs8u/W7eEfrFpFfIDFA%3D' (2025-05-02)
  → 'github:nixos/nixpkgs/c6f52ebd45e5925c188d1a20119978aa4ffd5ef6?narHash=sha256-m5KWt1nOm76ILk/JSCxBM4MfK3rYY7Wq9/TZIIeGnT8%3D' (2025-12-15)
---
 flake.lock |  8 +++----
 flake.nix  | 68 ++++++++++++++++++------------------------------------
 2 files changed, 27 insertions(+), 49 deletions(-)

diff --git a/flake.lock b/flake.lock
index 0299363..6eab611 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,16 +20,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1746183838,
-        "narHash": "sha256-kwaaguGkAqTZ1oK0yXeQ3ayYjs8u/W7eEfrFpFfIDFA=",
+        "lastModified": 1765838191,
+        "narHash": "sha256-m5KWt1nOm76ILk/JSCxBM4MfK3rYY7Wq9/TZIIeGnT8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "bf3287dac860542719fe7554e21e686108716879",
+        "rev": "c6f52ebd45e5925c188d1a20119978aa4ffd5ef6",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.11",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 7a9c391..1a98f34 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,18 +1,24 @@
 {
   description = "A bitmap programming font optimized for coziness";
 
-  inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
+  inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
   inputs.flake-utils.url = "github:numtide/flake-utils";
 
-  outputs = { self, nixpkgs, flake-utils }:
-    flake-utils.lib.eachDefaultSystem (system:
-      let pkgs = nixpkgs.legacyPackages.${system};
-      in {
+  outputs =
+    {
+      self,
+      nixpkgs,
+      flake-utils,
+    }:
+    flake-utils.lib.eachDefaultSystem (
+      system:
+      let
+        pkgs = nixpkgs.legacyPackages.${system};
+      in
+      {
         devShells = {
           default = pkgs.mkShellNoCC {
             packages = with pkgs; [
-              # BitsNPicas GUI wrapped with java
-              self.packages.${system}.bitsnpicas-bin
               # FontForge GUI
               fontforge-gtk
               # Python tools
@@ -24,35 +30,6 @@
           };
         };
         packages = rec {
-          # BitsNPicas needs to be fetched here since `nix build` is sandboxed
-          # and does not have internet access
-          bitsnpicas = pkgs.stdenvNoCC.mkDerivation rec {
-            pname = "bitsnpicas";
-            version = "2.1";
-            src = pkgs.fetchFromGitHub {
-              owner = "kreativekorp";
-              repo = "bitsnpicas";
-              rev = "v${version}";
-              hash = "sha256-hw7UuzesqpmnTjgpfikAIYyY70ni7BxjaUtHAPEdkXI=";
-            };
-            buildInputs = [ pkgs.zulu23 pkgs.zip ];
-            buildPhase = ''
-              cd main/java/BitsNPicas
-              make
-            '';
-            installPhase = ''
-              mkdir -p $out
-              cp BitsNPicas.jar $out
-              cp KeyEdit.jar $out
-              cp MapEdit.jar $out
-            '';
-          };
-
-          # Shell script to run the BitsNPicas GUI
-          bitsnpicas-bin = pkgs.writeShellScriptBin "bitsnpicas" ''
-            ${pkgs.zulu23}/bin/java -jar ${bitsnpicas}/BitsNPicas.jar $@
-          '';
-
           # Derivation to build and install cozette
           cozette = pkgs.stdenvNoCC.mkDerivation {
             pname = "cozette";
@@ -61,8 +38,8 @@
             src = ./.;
 
             buildInputs = with pkgs; [
-              (pkgs.python312.withPackages (ppkgs:
-                with ppkgs; [
+              (pkgs.python312.withPackages (
+                ppkgs: with ppkgs; [
                   numpy
                   pillow
                   fonttools
@@ -70,18 +47,18 @@
                   gitpython
                   setuptools
                   pip
-                ]))
+                ]
+              ))
               fontforge
-              zulu23
+              bitsnpicas
             ];
 
-            configurePhase = ''
-              mkdir -p deps
-              cp ${bitsnpicas}/BitsNPicas.jar deps/
+            postPatch = ''
+              substituteInPlace build.py --replace-fail \
+                'bitsnpicas.sh' '${pkgs.lib.getExe pkgs.bitsnpicas}'
             '';
 
             buildPhase = ''
-              patchShebangs bitsnpicas.sh
               python3 build.py fonts
             '';
 
@@ -102,5 +79,6 @@
           };
           default = cozette;
         };
-      });
+      }
+    );
 }