ui: drop non-flake fallback
I don't think nix-build gets regulally tested and I don't see how it would work without having clanPkgs available
This commit is contained in:
parent
4735586dac
commit
75f79abcc6
@ -1,7 +1,7 @@
|
|||||||
{ floco ? builtins.getFlake "github:aakropotkin/floco"
|
{ floco
|
||||||
, system ? builtins.currentSystem
|
, system
|
||||||
, pkgs ? import <nixpkgs> { currentSystem = system; }
|
, pkgs
|
||||||
, clanPkgs ? { }
|
, clanPkgs
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
|
|
||||||
@ -39,4 +39,3 @@ in
|
|||||||
{
|
{
|
||||||
inherit pkg fmod;
|
inherit pkg fmod;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
{ self, ... }:
|
{ self, ... }:
|
||||||
{
|
{
|
||||||
perSystem = { pkgs, system, ... }:
|
perSystem = { self', pkgs, ... }:
|
||||||
let
|
let
|
||||||
inherit (self.inputs) floco;
|
inherit (self.inputs) floco;
|
||||||
base = pkgs.callPackage ./default.nix { inherit floco system; clanPkgs = self.packages.${system}; };
|
base = pkgs.callPackage ./default.nix { inherit floco; clanPkgs = self'.packages; };
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
packages = {
|
packages = {
|
||||||
@ -15,7 +15,7 @@
|
|||||||
devShells.ui = pkgs.callPackage ./shell.nix {
|
devShells.ui = pkgs.callPackage ./shell.nix {
|
||||||
inherit pkgs;
|
inherit pkgs;
|
||||||
inherit (base) fmod pkg;
|
inherit (base) fmod pkg;
|
||||||
clanPkgs = self.packages.${system};
|
clanPkgs = self'.packages;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user