clan/clan-core
12
4
Fork 19
Code Issues 108 Pull Requests 2 Actions Packages Projects 1 Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/ui/default.nix
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;
} }

6
pkgs/ui/flake-module.nix
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;
}; };
}; };
} }