fix biri package and switch laptop to use it rather than niri
This commit is contained in:
7 files changed
+90
-39
No files matched your search
+14
-19
@@ -1,40 +1,35 @@
|
||||
{ inputs, self, ... }: {
|
||||
perSystem = { pkgs, ... }: {
|
||||
packages = let
|
||||
finalAttrs = rec {
|
||||
name = "${pname}-${version}";
|
||||
overrideAttrs = with pkgs; finalAttrs: prevAttrs: {
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}";
|
||||
pname = "biri";
|
||||
version = "26.04";
|
||||
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "barrulus";
|
||||
repo = pname;
|
||||
repo = finalAttrs.pname;
|
||||
rev = "82efb3c0fb688a0c738d15517a2e6a44ed7ca703";
|
||||
hash = "sha256-Gg4UHnugGnVZifxfKRUnxt3T+DSPgUvHEfE9tflA5zM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-aNovCzrTtmqTO33YtZap47npdN73zXC1bap5q5dZvZk=";
|
||||
};
|
||||
|
||||
overrideAttrs = with pkgs; prev: {
|
||||
rustPlatform = prev.rustPlatform // {
|
||||
buildRustPackage = args: pkgs.rustPlatform.buildRustPackage (args finalAttrs // finalAttrs);
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname src version;
|
||||
hash = finalAttrs.cargoHash;
|
||||
};
|
||||
};
|
||||
in {
|
||||
biri = pkgs.niri.override (prev: overrideAttrs prev);
|
||||
biri = (pkgs.niri.overrideAttrs (final: prev: overrideAttrs final prev));
|
||||
|
||||
biri-unwrapped = pkgs.niri.override (prev: (overrideAttrs prev) // {
|
||||
rustPlatform = (overrideAttrs prev).rustPlatform // {
|
||||
buildRustPackage = args: pkgs.rustPlatform.buildRustPackage (args finalAttrs // {
|
||||
postInstall = ''
|
||||
install -Dm0644 README.md resources/default-config.kdl -t $doc/share/doc/niri
|
||||
mv docs/wiki $doc/share/doc/niri/wiki
|
||||
cp -r . $out
|
||||
'';
|
||||
});
|
||||
};
|
||||
});
|
||||
biri-unwrapped = (pkgs.niri.overrideAttrs (final: prev: (overrideAttrs final prev) // {
|
||||
postInstall = ''
|
||||
install -Dm0644 README.md resources/default-config.kdl -t $doc/share/doc/niri
|
||||
mv docs/wiki $doc/share/doc/niri/wiki
|
||||
cp -r . $out
|
||||
'';
|
||||
}));
|
||||
};
|
||||
};
|
||||
}
|
||||
Reference in new issue
Block a user