ui: drop non-flake fallback
All checks were successful
checks-impure / test (pull_request) Successful in 3s
checks / test (pull_request) Successful in 16s

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:
Jörg Thalheim 2023-08-27 10:27:34 +02:00
parent 4735586dac
commit 75f79abcc6
2 changed files with 7 additions and 8 deletions

View File

@ -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;
}

View File

@ -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;
};
};
}