lix-project/nixos-module
15
5
Fork 12
Code Issues 3 Pull requests Packages Projects Releases Wiki Activity

Allow use of lix from nixpkgs

Browse source 
Change behaviour of module. Allow not specifying LixSrc
and provide fallback to nixpkgs.pkgs.lix
This commit is contained in:
crop 2024-07-21 20:15:55 +02:00
parent d70318fb94
commit a537be487b
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
module.nix
View file

@ -1,5 +1,5 @@
{ lix, versionSuffix ? "" }: { lixSrc ? null, versionSuffix ? "" }:
{ pkgs, config, ... }: { pkgs, config, ... }:
{ {
nixpkgs.overlays = [ (import ./overlay.nix { inherit lix versionSuffix; }) ]; nixpkgs.overlays = [ (import ./overlay.nix { inherit lixSrc versionSuffix; }) ];
} }

18
overlay.nix
View file

@ -1,16 +1,20 @@
{ lix, versionSuffix ? "" }: { lixSrc ? null, versionSuffix ? "" }:
final: prev: final: prev:
let let
# This is kind of scary to not override the nix version to pretend to be # This is kind of scary to not override the nix version to pretend to be
# 2.18 since nixpkgs can introduce new breakage in its Nix unstable CLI # 2.18 since nixpkgs can introduce new breakage in its Nix unstable CLI
# usage. # usage.
# https://github.com/nixos/nixpkgs/blob/6afb255d976f85f3359e4929abd6f5149c323a02/nixos/modules/config/nix.nix#L121 # https://github.com/nixos/nixpkgs/blob/6afb255d976f85f3359e4929abd6f5149c323a02/nixos/modules/config/nix.nix#L121
lixPkg = final.callPackage (lix + "/package.nix") ({ lixPkg =
versionSuffix = "-${versionSuffix}"; if lixSrc == null
# FIXME: do this more sensibly for future releases then prev.pkgs.lix
# https://git.lix.systems/lix-project/lix/issues/406 else
officialRelease = false; final.callPackage (lixSrc + "/package.nix") ({
}); versionSuffix = "-${versionSuffix}";
# FIXME: do this more sensibly for future releases
# https://git.lix.systems/lix-project/lix/issues/406
officialRelease = false;
});
# These packages depend on Nix features that Lix does not support # These packages depend on Nix features that Lix does not support
overridelist_2_18 = [ overridelist_2_18 = [