From 28262a1d2ff979b4188d284222f3628417b9a3cb Mon Sep 17 00:00:00 2001 From: Sean Baildon Date: Mon, 17 Jul 2023 10:50:21 +0200 Subject: [PATCH] aarch64, tailwind from nixpkgs --- flake.lock | 32 ++++++++------------------------ flake.nix | 20 +++++++++----------- 2 files changed, 17 insertions(+), 35 deletions(-) diff --git a/flake.lock b/flake.lock index 80ddfa9..93f942c 100644 --- a/flake.lock +++ b/flake.lock @@ -2,39 +2,23 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1651369430, - "narHash": "sha256-d86uUm0s11exU9zLo2K1AwtJQJDKubFpoF0Iw767uT4=", + "lastModified": 1689582805, + "narHash": "sha256-Qx/DVhF2+8pA8jC1o+mcwOaSVkMr4+e943JzfaoFmsQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b283b64580d1872333a99af2b4cef91bb84580cf", + "rev": "1211e44d5b89641d47cedbec89dd2210a0a1aca8", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1211e44d5b89641d47cedbec89dd2210a0a1aca8", + "type": "github" } }, "root": { "inputs": { - "nixpkgs": "nixpkgs", - "tailwindcssPkg": "tailwindcssPkg" - } - }, - "tailwindcssPkg": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1, - "narHash": "sha256-rW7VEO9V252lI0DuZA5Fh0nvGj0epjufZEkGWgll94U=", - "path": "./nix/tailwindcss", - "type": "path" - }, - "original": { - "path": "./nix/tailwindcss", - "type": "path" + "nixpkgs": "nixpkgs" } } }, diff --git a/flake.nix b/flake.nix index 80629c2..dd52bb6 100644 --- a/flake.nix +++ b/flake.nix @@ -4,27 +4,25 @@ # go here for using all system # https://serokell.io/blog/practical-nix-flakes - inputs = - { - tailwindcssPkg.url = "path:./nix/tailwindcss"; - tailwindcssPkg.inputs.nixpkgs.follows = "nixpkgs"; - }; + inputs = { + nixpkgs.url = + "github:NixOS/nixpkgs/1211e44d5b89641d47cedbec89dd2210a0a1aca8"; + }; - outputs = { self, nixpkgs, tailwindcssPkg }: - let - pkgs = nixpkgs.legacyPackages.x86_64-darwin; - tailwindcss = tailwindcssPkg.packages.x86_64-darwin.tailwindcss; + outputs = { self, nixpkgs }: + let + pkgs = nixpkgs.legacyPackages.aarch64-darwin; in { # nix develop - devShells.x86_64-darwin.default = pkgs.mkShell { + devShells.aarch64-darwin.default = pkgs.mkShell { buildInputs = with pkgs.darwin.apple_sdk.frameworks; [ pkgs.mustache-go pkgs.libwebp pkgs.pandoc - tailwindcss + pkgs.tailwindcss ]; }; }; -- 2.45.2