mirror of
https://github.com/noctalia-dev/noctalia-shell.git
synced 2026-05-11 17:08:27 +08:00
fix(nix): inherit noctalia-qs overlay in our overlay
This avoids a second instantiation of Nixpkgs, when consuming the
overlay, instead of using the package output directly.
Smoke test:
```console
nix repl
nix-repl> :lf .
nix-repl> pkgs = imports inputs.nixpkgs { overlays = [outputs.overlays.default]; }
nix-repl> pkgs.noctalia-shell
«derivation /nix/store/30ilvacnyyqyrnqh26vz6x1s095iwysb-noctalia-shell-2026-03-22_df0a16d.drv»
nix-repl> pkgs.quickshell
«derivation /nix/store/zyrm8fb4r4bq6mqrv4ssjc08haf5j2b4-quickshell-2026-03-21_c9beee5.drv»
```
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
This commit is contained in:
@@ -8,3 +8,5 @@ __pycache__
|
||||
result
|
||||
build
|
||||
/debian/
|
||||
.direnv/
|
||||
.envrc
|
||||
|
||||
@@ -24,6 +24,16 @@
|
||||
self.overlays.default
|
||||
]
|
||||
);
|
||||
|
||||
mkDate =
|
||||
longDate:
|
||||
nixpkgs.lib.concatStringsSep "-" [
|
||||
(builtins.substring 0 4 longDate)
|
||||
(builtins.substring 4 2 longDate)
|
||||
(builtins.substring 6 2 longDate)
|
||||
];
|
||||
|
||||
version = mkDate (self.lastModifiedDate or "19700101") + "_" + (self.shortRev or "dirty");
|
||||
in
|
||||
{
|
||||
formatter = eachSystem (system: pkgsFor.${system}.nixfmt);
|
||||
@@ -33,22 +43,14 @@
|
||||
});
|
||||
|
||||
overlays = {
|
||||
default = final: prev: {
|
||||
noctalia-shell = final.callPackage ./nix/package.nix {
|
||||
version =
|
||||
let
|
||||
mkDate =
|
||||
longDate:
|
||||
final.lib.concatStringsSep "-" [
|
||||
(builtins.substring 0 4 longDate)
|
||||
(builtins.substring 4 2 longDate)
|
||||
(builtins.substring 6 2 longDate)
|
||||
];
|
||||
in
|
||||
mkDate (self.lastModifiedDate or "19700101") + "_" + (self.shortRev or "dirty");
|
||||
quickshell = noctalia-qs.packages.${prev.stdenv.hostPlatform.system}.default;
|
||||
};
|
||||
};
|
||||
default = nixpkgs.lib.composeManyExtensions [
|
||||
noctalia-qs.overlays.default
|
||||
(final: prev: {
|
||||
noctalia-shell = final.callPackage ./nix/package.nix {
|
||||
inherit version;
|
||||
};
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
devShells = eachSystem (system: {
|
||||
|
||||
Reference in New Issue
Block a user