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

Allow use of lix from nixpkgs #32

Closed
crop wants to merge 1 commit from crop/nixos-module:main into main
pull from: crop/nixos-module:main
merge into: lix-project:main
Conversation 2 Commits 1 Files changed 2 +13 -9
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit a537be487b - Show all commits

4
module.nix
View file

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

8
overlay.nix
View file

@ -1,11 +1,15 @@
{ lix, versionSuffix ? "" }:
{ lixSrc ? null, versionSuffix ? "" }:
final: prev:
let
# 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
# usage.
# https://github.com/nixos/nixpkgs/blob/6afb255d976f85f3359e4929abd6f5149c323a02/nixos/modules/config/nix.nix#L121
lixPkg = final.callPackage (lix + "/package.nix") ({
lixPkg =
if lixSrc == null
then prev.pkgs.lix
else
final.callPackage (lixSrc + "/package.nix") ({
versionSuffix = "-${versionSuffix}";
# FIXME: do this more sensibly for future releases
# https://git.lix.systems/lix-project/lix/issues/406