nix: clean up flake and ignore nix build artifact

This commit is contained in:
NotAShelf 2023-08-30 14:46:21 +03:00 committed by Stanisław Zagórowski
parent 163a0e7005
commit b719a7b731
4 changed files with 49 additions and 14 deletions

1
.gitignore vendored
View file

@ -2,3 +2,4 @@ build/
.cache/
*.so
compile_flags.txt
result/

18
flake.lock generated
View file

@ -47,6 +47,21 @@
"type": "github"
}
},
"nix-filter": {
"locked": {
"lastModified": 1687178632,
"narHash": "sha256-HS7YR5erss0JCaUijPeyg2XrisEb959FIct3n2TMGbE=",
"owner": "numtide",
"repo": "nix-filter",
"rev": "d90c75e8319d0dd9be67d933d8eb9d0894ec9174",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "nix-filter",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1691654369,
@ -65,7 +80,8 @@
},
"root": {
"inputs": {
"hyprland": "hyprland"
"hyprland": "hyprland",
"nix-filter": "nix-filter"
}
},
"systems": {

View file

@ -1,25 +1,44 @@
{
inputs = {
hyprland.url = "github:hyprwm/Hyprland";
nix-filter.url = "github:numtide/nix-filter";
};
outputs = { self, hyprland, ... }: let
outputs = {
self,
hyprland,
nix-filter,
...
}: let
inherit (hyprland.inputs) nixpkgs;
hyprlandSystems = fn: nixpkgs.lib.genAttrs (builtins.attrNames hyprland.packages) (system: fn system nixpkgs.legacyPackages.${system});
forHyprlandSystems = fn: nixpkgs.lib.genAttrs (builtins.attrNames hyprland.packages) (system: fn system nixpkgs.legacyPackages.${system});
in {
packages = hyprlandSystems (system: pkgs: rec {
packages = forHyprlandSystems (system: pkgs: rec {
split-monitor-workspaces = pkgs.stdenv.mkDerivation {
pname = "split-monitor-workspaces";
version = "0.1";
src = ./.;
src = nix-filter.lib {
root = ./.;
include = [
"src"
"include"
./Makefile
./meson.build
];
};
nativeBuildInputs = with pkgs; [ meson ninja pkg-config ];
# allow overriding xwayland support
BUILT_WITH_NOXWAYLAND = false;
buildInputs = with pkgs; [
hyprland.packages.${system}.hyprland.dev
pango
cairo
] ++ hyprland.packages.${system}.hyprland.buildInputs;
nativeBuildInputs = with pkgs; [meson ninja pkg-config];
buildInputs = with pkgs;
[
hyprland.packages.${system}.hyprland.dev
pango
cairo
]
++ hyprland.packages.${system}.hyprland.buildInputs;
meta = with pkgs.lib; {
homepage = "https://github.com/Duckonaut/split-monitor-workspaces";
@ -32,7 +51,7 @@
default = split-monitor-workspaces;
});
devShells = hyprlandSystems (system: pkgs: {
devShells = forHyprlandSystems (system: pkgs: {
default = pkgs.mkShell {
name = "split-monitor-workspaces";
@ -41,7 +60,7 @@
bear
];
inputsFrom = [ self.packages.${system}.split-monitor-workspaces ];
inputsFrom = [self.packages.${system}.split-monitor-workspaces];
};
});
};

1
result
View file

@ -1 +0,0 @@
/nix/store/bjf217i1id0y2wqsmgrfl7wjbb9f913g-split-monitor-workspaces-0.1