mirror of
https://github.com/DreamMaoMao/maomaowm.git
synced 2025-10-28 05:40:19 -04:00
nix: merge mmsg to mangowc project
This commit is contained in:
parent
80efd31e21
commit
02d65c33e4
4 changed files with 2 additions and 71 deletions
55
flake.lock
generated
55
flake.lock
generated
|
|
@ -18,45 +18,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts_2": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": "nixpkgs-lib_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1741352980,
|
||||
"narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"mmsg": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts_2",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1758702011,
|
||||
"narHash": "sha256-bUDn7H0Kt0Z4pjgki8B6jP1HMAklN0Fh+7zwW3JTw4I=",
|
||||
"owner": "DreamMaoMao",
|
||||
"repo": "mmsg",
|
||||
"rev": "55b64e3728c3a95673ff73ccd9c3865db86f4fec",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "DreamMaoMao",
|
||||
"repo": "mmsg",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1750386251,
|
||||
|
|
@ -88,25 +49,9 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-lib_2": {
|
||||
"locked": {
|
||||
"lastModified": 1740877520,
|
||||
"narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs.lib",
|
||||
"rev": "147dee35aab2193b174e4c0868bd80ead5ce755c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs.lib",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts",
|
||||
"mmsg": "mmsg",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"scenefx": "scenefx"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,10 +2,6 @@
|
|||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
|
||||
flake-parts.url = "github:hercules-ci/flake-parts";
|
||||
mmsg = {
|
||||
url = "github:DreamMaoMao/mmsg";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
scenefx = {
|
||||
url = "github:wlrfx/scenefx";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
|
@ -33,9 +29,7 @@
|
|||
...
|
||||
}: let
|
||||
inherit (pkgs) callPackage ;
|
||||
inherit (inputs.mmsg.packages.${pkgs.system}) mmsg;
|
||||
mango = callPackage ./nix {
|
||||
inherit mmsg;
|
||||
inherit (inputs.scenefx.packages.${pkgs.system}) scenefx;
|
||||
};
|
||||
shellOverride = old: {
|
||||
|
|
@ -49,7 +43,6 @@
|
|||
};
|
||||
packages = {
|
||||
inherit mango;
|
||||
inherit mmsg;
|
||||
};
|
||||
devShells.default = mango.overrideAttrs shellOverride;
|
||||
formatter = pkgs.alejandra;
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@
|
|||
enableXWayland ? true,
|
||||
meson,
|
||||
ninja,
|
||||
mmsg,
|
||||
scenefx,
|
||||
wlroots_0_19,
|
||||
libGL,
|
||||
|
|
@ -60,7 +59,6 @@ in
|
|||
|
||||
passthru = {
|
||||
providedSessions = ["mango"];
|
||||
inherit mmsg;
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
@ -71,4 +69,4 @@ in
|
|||
maintainers = [];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,12 +21,7 @@ in {
|
|||
environment.systemPackages =
|
||||
[
|
||||
cfg.package
|
||||
]
|
||||
++ (
|
||||
if (builtins.hasAttr "mmsg" cfg.package)
|
||||
then [cfg.package.mmsg]
|
||||
else []
|
||||
);
|
||||
];
|
||||
|
||||
xdg.portal = {
|
||||
enable = lib.mkDefault true;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue