nix-community/nix-on-droid
1
0
Fork 0
mirror of https://github.com/nix-community/nix-on-droid.git synced 2025-11-08 11:36:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

nix: add package option

Browse source
This commit is contained in:
Tobias Happ 2021-07-24 15:23:18 +02:00 • committed by Alexander Sosedkin
parent 3e3a4e2d04
commit e4d19673af
3 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGELOG.md
View file

@ -1,5 +1,11 @@
# Changelog # Changelog
## Release 21.11 (unreleased)
### New Options
* The `nix.package` can be used to set the system-wide nix package.
## Release 21.05 ## Release 21.05
### New Options ### New Options

11
modules/environment/nix.nix
View file

@ -1,4 +1,4 @@
# Copyright (c) 2019-2020, see AUTHORS. Licensed under MIT License, see LICENSE. # Copyright (c) 2019-2021, see AUTHORS. Licensed under MIT License, see LICENSE.
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
@ -15,6 +15,15 @@ in
options = { options = {
nix = { nix = {
package = mkOption {
type = types.package;
default = pkgs.nix;
defaultText = "pkgs.nix";
description = ''
This option specifies the Nix package instance to use throughout the system.
'';
};
substituters = mkOption { substituters = mkOption {
type = types.listOf types.str; type = types.listOf types.str;
default = []; default = [];

6
modules/environment/path.nix
View file

@ -1,4 +1,4 @@
# Copyright (c) 2019-2020, see AUTHORS. Licensed under MIT License, see LICENSE. # Copyright (c) 2019-2021, see AUTHORS. Licensed under MIT License, see LICENSE.
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
@ -42,12 +42,12 @@ in
environment = { environment = {
packages = [ packages = [
(pkgs.callPackage ../../nix-on-droid { }) (pkgs.callPackage ../../nix-on-droid { nix = config.nix.package; })
pkgs.bashInteractive pkgs.bashInteractive
pkgs.cacert pkgs.cacert
pkgs.coreutils pkgs.coreutils
pkgs.less # since nix tools really want a pager available, #27 pkgs.less # since nix tools really want a pager available, #27
pkgs.nix config.nix.package
]; ];
path = pkgs.buildEnv { path = pkgs.buildEnv {