From 6b31fa5d24df2949c7987f6fa349e6ef86e2fc00 Mon Sep 17 00:00:00 2001
From: Akshay <nerdy@peppe.rs>
Date: Fri, 1 Oct 2021 21:48:11 +0530
Subject: rework builds to use nix flakes

---
 flake.nix | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'flake.nix')

diff --git a/flake.nix b/flake.nix
index cb2c04c..ee909ef 100644
--- a/flake.nix
+++ b/flake.nix
@@ -33,26 +33,23 @@
       overlay = final: prev: rec {
 
         bitsnpicas = with final; pkgs.writeScriptBin "bitsnpicas" ''
-          ${jdk}/bin/java -jar ${bitsnpicas-src}/downloads/BitsNPicas.jar 
+          ${jdk}/bin/java -jar ${bitsnpicas-src}/downloads/BitsNPicas.jar "$@"
         '';
 
         scientifica = with final; pkgs.stdenvNoCC.mkDerivation {
           pname = "scientifica";
           version = "v2.3";
-          src = ./.;
+          src = ./src;
 
           buildPhase = ''
             runHook preBuild
 
-            fontforge=${pkgs.fontforge}/bin/fontforge
-            bitsnpicas=${self.packages.bitsnpicas}/bin/bitsnpicas
-
             ff_filter() {
-              fontforge -c 'open(argv[1]).generate(argv[2])' "$@"
+              ${pkgs.fontforge}/bin/fontforge -c 'open(argv[1]).generate(argv[2])' "$@"
             }
 
             ttf_filter() {
-              bitsnpicas convertbitmap -f ttf -o "$2" "$1"
+              ${pkgs.bitsnpicas}/bin/bitsnpicas convertbitmap -f ttf -o "$2" "$1"
             }
 
             mkdir -p $out/{ttf,otb,bdf}
@@ -68,14 +65,15 @@
               ff_filter "$i" "$out/bdf/$file_name.bdf"
             done
 
-            # copy ligature plugins
-            cp -r $src/ligature_plugins $out/ligature_plugins
-
             popd
 
             runHook postBuild
           '';
 
+          installPhase = ''
+            true
+          '';
+
         };
 
       };
-- 
cgit v1.2.3