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:
@@ -1,7 +1,7 @@
|
||||
{ floco ? builtins.getFlake "github:aakropotkin/floco"
|
||||
, system ? builtins.currentSystem
|
||||
, pkgs ? import <nixpkgs> { currentSystem = system; }
|
||||
, clanPkgs ? { }
|
||||
{ floco
|
||||
, system
|
||||
, pkgs
|
||||
, clanPkgs
|
||||
}:
|
||||
let
|
||||
|
||||
@@ -39,4 +39,3 @@ in
|
||||
{
|
||||
inherit pkg fmod;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{ self, ... }:
|
||||
{
|
||||
perSystem = { pkgs, system, ... }:
|
||||
perSystem = { self', pkgs, ... }:
|
||||
let
|
||||
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
|
||||
{
|
||||
packages = {
|
||||
@@ -15,7 +15,7 @@
|
||||
devShells.ui = pkgs.callPackage ./shell.nix {
|
||||
inherit pkgs;
|
||||
inherit (base) fmod pkg;
|
||||
clanPkgs = self.packages.${system};
|
||||
clanPkgs = self'.packages;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user