mirror of
https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config.git
synced 2025-02-16 22:34:33 +00:00
sp-extensions.json is read from /etc/nixos flake input
This commit is contained in:
parent
c20bef314e
commit
fcbde507fc
|
@ -10,8 +10,6 @@
|
||||||
# the /etc/nixos folder input is expected to be set by the caller
|
# the /etc/nixos folder input is expected to be set by the caller
|
||||||
# for example, upon nix build using --override-input
|
# for example, upon nix build using --override-input
|
||||||
etc-nixos.flake = false;
|
etc-nixos.flake = false;
|
||||||
|
|
||||||
sp-extensions-json.flake = false;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs =
|
outputs =
|
||||||
|
@ -19,14 +17,13 @@
|
||||||
, etc-nixos
|
, etc-nixos
|
||||||
, nixpkgs
|
, nixpkgs
|
||||||
, selfprivacy-overlay
|
, selfprivacy-overlay
|
||||||
, sp-extensions-json
|
|
||||||
} @ inputs:
|
} @ inputs:
|
||||||
let
|
let
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
userdata =
|
userdata =
|
||||||
builtins.fromJSON (builtins.readFile "${etc-nixos}/userdata.json");
|
builtins.fromJSON (builtins.readFile "${etc-nixos}/userdata.json");
|
||||||
sp-extensions =
|
sp-extensions =
|
||||||
builtins.fromJSON (builtins.readFile sp-extensions-json);
|
builtins.fromJSON (builtins.readFile "${etc-nixos}/sp-extensions.json");
|
||||||
lib = nixpkgs.legacyPackages.${system}.lib;
|
lib = nixpkgs.legacyPackages.${system}.lib;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue