Merge pull request 'ui: drop non-flake fallback' (#198) from Mic92-main into main

This commit is contained in:
clan-bot
2023-08-27 08:29:21 +00:00
2 changed files with 7 additions and 8 deletions

View File

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

View File

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