From 6bb61f86c1637160061389f34f30849fe2f3483c Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Wed, 25 Apr 2018 14:52:43 +0200 Subject: custom nixpkgs --- .gitmodules | 4 ++++ nixpkgs | 1 + nixpkgs.nix | 7 +++++++ ymir.nix | 1 + 4 files changed, 13 insertions(+) create mode 160000 nixpkgs create mode 100644 nixpkgs.nix diff --git a/.gitmodules b/.gitmodules index 7c47ad8f..df0f354a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,3 +19,7 @@ [submodule "musnix"] path = musnix url = git://github.com/musnix/musnix.git +[submodule "nixpkgs"] + path = nixpkgs + url = github.com:pngwjpgh/nixpkgs + branch = live diff --git a/nixpkgs b/nixpkgs new file mode 160000 index 00000000..e8e46c74 --- /dev/null +++ b/nixpkgs @@ -0,0 +1 @@ +Subproject commit e8e46c74fdb37fa8d56f4cf45126050c02e9b928 diff --git a/nixpkgs.nix b/nixpkgs.nix new file mode 100644 index 00000000..34bd0a39 --- /dev/null +++ b/nixpkgs.nix @@ -0,0 +1,7 @@ +{ config, pkgs, lib, ... }: + +{ + config = { + nixpkgs.pkgs = import ./nixpkgs { inherit (config.nixpkgs) config overlays system; }; + }; +} diff --git a/ymir.nix b/ymir.nix index c3cb93e7..efd41ce5 100644 --- a/ymir.nix +++ b/ymir.nix @@ -34,6 +34,7 @@ let in rec { imports = [ + ./nixpkgs.nix ./ymir/hw.nix ./ymir/mlmmj-expose.nix ./custom/zsh.nix -- cgit v1.2.3