From 1a774d61bb3ec28ac202a43450f35017f918e46e Mon Sep 17 00:00:00 2001
From: Timothy DeHerrera <tim.deh@pm.me>
Date: Tue, 8 Jun 2021 17:00:04 -0600
Subject: [PATCH] Fix flake package
---
flake.lock | 19 +++++++++++++++++++
flake.nix | 8 +++++++-
2 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/flake.lock b/flake.lock
index dfabdb0e..9b83910a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -30,6 +30,24 @@
"type": "github"
}
},
+ "helix": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1623200791,
+ "narHash": "sha256-kZKThNh1dBSCnISk9vwbqctk1+U0s8Lzasz/CVytJps=",
+ "ref": "master",
+ "rev": "b20e4a108cd890afa6cdf83656856fc2157a8e84",
+ "revCount": 789,
+ "submodules": true,
+ "type": "git",
+ "url": "https://github.com/helix-editor/helix"
+ },
+ "original": {
+ "submodules": true,
+ "type": "git",
+ "url": "https://github.com/helix-editor/helix"
+ }
+ },
"naersk": {
"inputs": {
"nixpkgs": "nixpkgs"
@@ -95,6 +113,7 @@
"root": {
"inputs": {
"flake-utils": "flake-utils",
+ "helix": "helix",
"naersk": "naersk",
"nixpkgs": "nixpkgs_2",
"rust-overlay": "rust-overlay"
diff --git a/flake.nix b/flake.nix
index 8ad3c90a..3626be9a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,6 +6,12 @@
flake-utils.url = "github:numtide/flake-utils";
rust-overlay.url = "github:oxalica/rust-overlay";
naersk.url = "github:nmattia/naersk";
+ helix = {
+ flake = false;
+ url = "https://github.com/helix-editor/helix";
+ type = "git";
+ submodules = true;
+ };
};
outputs = inputs@{ self, nixpkgs, naersk, rust-overlay, flake-utils, ... }:
@@ -25,7 +31,7 @@
in rec {
packages.helix = naerskLib.buildPackage {
pname = "helix";
- root = ./.;
+ root = inputs.helix;
};
defaultPackage = packages.helix;
devShell = pkgs.callPackage ./shell.nix {};