From 741dad4df562e1a77ab4ab886e14ecb4cf3e2579 Mon Sep 17 00:00:00 2001 From: rotterdam Date: Thu, 6 Apr 2023 12:29:12 -0300 Subject: [PATCH] Finished adding package template --- flake.nix | 4 ++++ package/flake.nix | 8 +++++--- package/package.nix | 4 +--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index e3534b2..1146f58 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,10 @@ path = ./hello; description = "Template including hello in shell packages"; }; + package = { + path = ./package; + description = "Template for a nix package"; + }; rust = { path = ./rust; description = "Rust template, using oxalica/rust-overlay"; diff --git a/package/flake.nix b/package/flake.nix index 2b20800..31c3ece 100644 --- a/package/flake.nix +++ b/package/flake.nix @@ -1,5 +1,5 @@ { - description = "Flake template for nix package"; + description = "Template for a nix package"; inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; @@ -11,7 +11,9 @@ let pkgs = import nixpkgs { inherit system; }; in with pkgs; { devShells.default = mkShell { packages = [ ]; }; - packages.default = self.packages."${system}".package; - packages."package" = pkgs.callPackage ./package.nix { }; + packages = { + default = self.packages."${system}".package; + "package" = pkgs.callPackage ./package.nix { }; + }; }); } diff --git a/package/package.nix b/package/package.nix index b642733..7bad0de 100644 --- a/package/package.nix +++ b/package/package.nix @@ -1,6 +1,4 @@ -{ lib -, stdenv -}: +{ lib, stdenv }: stdenv.mkDerivation (finalAttrs: { pname = "";