update and fix flake build

This commit is contained in:
puttaalu 2024-10-12 17:53:10 +02:00
parent d8fb9adb1e
commit ea9d993324
6 changed files with 76 additions and 39 deletions

View File

@ -6,15 +6,12 @@ pkgs.stdenv.mkDerivation {
src = pkgs.fetchzip { src = pkgs.fetchzip {
url = "https://smc.org.in/downloads/fonts/anjalioldlipi/anjalioldlipi.zip"; url = "https://smc.org.in/downloads/fonts/anjalioldlipi/anjalioldlipi.zip";
hash = "sha256-yqlTyoDQPKmH/ssTSrQPZEqFiuN+pvZyGLggiQWoa/M=s"; hash = "sha256-c3ScpdN2h39Q6GLFL97pBBGrsillcMXmhlGilOAdF1w=";
stripRoot = false; stripRoot = false;
}; };
installPhase = '' installPhase = ''
runHook preInstall
install -Dm444 -t $out/share/fonts/truetype $src/*.ttf install -Dm444 -t $out/share/fonts/truetype $src/*.ttf
runHook postInstall
''; '';
meta = with pkgs.lib; { meta = with pkgs.lib; {

View File

@ -6,15 +6,12 @@ pkgs.stdenv.mkDerivation {
src = pkgs.fetchzip { src = pkgs.fetchzip {
url = "https://smc.org.in/downloads/fonts/chilanka/chilanka.zip"; url = "https://smc.org.in/downloads/fonts/chilanka/chilanka.zip";
hash = "sha256-u3hUW6EFhr9FIUl28u7TUKEclxWcpK95OUmL+SCwkD0=s"; hash = "sha256-z+pRvm/8alA3TbUBuR4oDD/kpvuXJTqOBlzXEKBZvnE=";
stripRoot = false; stripRoot = false;
}; };
installPhase = '' installPhase = ''
runHook preInstall
install -Dm444 -t $out/share/fonts/truetype $src/*.ttf install -Dm444 -t $out/share/fonts/truetype $src/*.ttf
runHook postInstall
''; '';
meta = with pkgs.lib; { meta = with pkgs.lib; {

View File

@ -1,6 +1,5 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
manjari = pkgs.callPackage ./manjari { }; manjari = pkgs.callPackage ./manjari { };
anjali-old-lipi = pkgs.callPackage ./anjali-old-lipi { }; anjali-old-lipi = pkgs.callPackage ./anjali-old-lipi { };

View File

@ -1,5 +1,23 @@
{ {
"nodes": { "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": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1721924956, "lastModified": 1721924956,
@ -18,8 +36,24 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs" "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", "root": "root",

View File

@ -3,16 +3,30 @@
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; 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 all = pkgs.symlinkJoin {
pkgs = import nixpkgs { system = "x86_64-linux";}; name = "all";
in { paths =
smcFonts = import ./default.nix { inherit pkgs; }; [ font-smc-anjali-old-lipi font-smc-chilanka font-smc-manjari ];
default = self.packages.x86_64-linux.smcFonts.chilanka;
}; };
default = packages.all;
}; };
});
} }

View File

@ -6,16 +6,12 @@ pkgs.stdenv.mkDerivation {
src = pkgs.fetchzip { src = pkgs.fetchzip {
url = "https://smc.org.in/downloads/fonts/manjari/manjari.zip"; url = "https://smc.org.in/downloads/fonts/manjari/manjari.zip";
hash = "sha256-u3hUW6EFhr9FIUl28u7TUKEclxWcpK95OUmL+SCwkD0="; hash = "sha256-Sq/7UOBO54c3id6FMZeOmnZTRceEkMAAN8W+C7v7Mtw=";
stripRoot = false; stripRoot = false;
}; };
installPhase = '' installPhase = ''
runHook preInstall
install -Dm444 -t $out/share/fonts/opentype $src/*.otf install -Dm444 -t $out/share/fonts/opentype $src/*.otf
install -Dm444 -t $out/share/fonts/truetype $src/*.ttf
runHook postInstall
''; '';
meta = with pkgs.lib; { meta = with pkgs.lib; {