From d544b214d210a0e684cd8d5a65261f03daa83f69 Mon Sep 17 00:00:00 2001 From: Jeremy Wall Date: Mon, 23 May 2022 16:58:04 -0400 Subject: [PATCH] Fix sile on darwin --- Makefile | 2 +- nix/sile/flake.lock | 43 +++++++++++++++++++++++++++++++++++++++++++ nix/sile/flake.nix | 22 ++++++++++++++++++++++ 3 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 nix/sile/flake.lock create mode 100644 nix/sile/flake.nix diff --git a/Makefile b/Makefile index 3c2537b..55e1af8 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ static/pdf/resume-jeremy-wall.pdf: resume/resume.sil resume/resume.lua mkdir -p static/pdf/ mkdir -p ~/.local/share/fonts cp resume/.fonts/* ~/.local/share/fonts/ - nix-shell -p sile --command "sile --debug classes -o $@ resume/resume.sil" + bash bin/sile --debug classes -o $@ resume/resume.sil publish: build cd public diff --git a/nix/sile/flake.lock b/nix/sile/flake.lock new file mode 100644 index 0000000..a6134c6 --- /dev/null +++ b/nix/sile/flake.lock @@ -0,0 +1,43 @@ +{ + "nodes": { + "flake-utils": { + "locked": { + "lastModified": 1652776076, + "narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1653328845, + "narHash": "sha256-NKc98+iX8YH500np1zWZSQ2C+FoD9sS/nuH02Rg2ats=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "7ae60dd7068478db5d936a3850b6df859aec21d0", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "22.05-beta", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/nix/sile/flake.nix b/nix/sile/flake.nix new file mode 100644 index 0000000..4b66d06 --- /dev/null +++ b/nix/sile/flake.nix @@ -0,0 +1,22 @@ +{ + inputs = { + nixpkgs.url = "github:nixos/nixpkgs?ref=22.05-beta"; + flake-utils.url = "github:numtide/flake-utils"; + }; + + outputs = {self, nixpkgs, flake-utils}: + flake-utils.lib.eachDefaultSystem (system: + let + pkgs = import nixpkgs { inherit system; }; + sile = pkgs.sile.overrideAttrs(oldAttrs: { doCheck = false; }); + in { + packages.sile = sile; + apps.sile = { + type = "app"; + program = "${sile}/bin/sile"; + }; + devShell = pkgs.mkShell { + buildInputs = [ sile ]; + }; + }); +}