mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-01-24 13:32:50 -05:00
nix: remove dgop input; expose quickshell package (#1183)
* nix: remove dgop input * nix: update quickshell * nix: expose quickshell in outputs
This commit is contained in:
14
flake.nix
14
flake.nix
@@ -3,12 +3,8 @@
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
dgop = {
|
||||
url = "github:AvengeMedia/dgop";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
quickshell = {
|
||||
url = "git+https://git.outfoxxed.me/quickshell/quickshell?rev=3918290c1bcd93ed81291844d9f1ed146672dbfc";
|
||||
url = "git+https://git.outfoxxed.me/quickshell/quickshell?rev=41828c4180fb921df7992a5405f5ff05d2ac2fff";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
@@ -17,7 +13,6 @@
|
||||
{
|
||||
self,
|
||||
nixpkgs,
|
||||
dgop,
|
||||
quickshell,
|
||||
...
|
||||
}:
|
||||
@@ -29,15 +24,14 @@
|
||||
);
|
||||
buildDmsPkgs = pkgs: {
|
||||
dms-shell = self.packages.${pkgs.stdenv.hostPlatform.system}.default;
|
||||
inherit (dgop.packages.${pkgs.stdenv.hostPlatform.system}) dgop;
|
||||
quickshell = quickshell.packages.${pkgs.stdenv.hostPlatform.system}.default;
|
||||
};
|
||||
mkModuleWithDmsPkgs =
|
||||
path:
|
||||
modulePath:
|
||||
args@{ pkgs, ... }:
|
||||
{
|
||||
imports = [
|
||||
(import path (args // { dmsPkgs = buildDmsPkgs pkgs; }))
|
||||
(import modulePath (args // { dmsPkgs = buildDmsPkgs pkgs; }))
|
||||
];
|
||||
};
|
||||
mkQmlImportPath =
|
||||
@@ -145,6 +139,8 @@
|
||||
}
|
||||
);
|
||||
|
||||
quickshell = quickshell.packages.${system}.default;
|
||||
|
||||
default = self.packages.${system}.dms-shell;
|
||||
}
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user