mirrors/maomaowm
1
0
Fork 0
mirror of https://github.com/DreamMaoMao/maomaowm.git synced 2025-10-29 05:40:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

nix: merge mmsg to mangowc project

Browse source
This commit is contained in:
ProggerX 2025-10-18 09:46:18 +03:00 • committed by DreamMaoMao
parent 80efd31e21
commit 02d65c33e4
4 changed files with 2 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

55
flake.lock generated
View file

@ -18,45 +18,6 @@
"type": "github" "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": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1750386251, "lastModified": 1750386251,
@ -88,25 +49,9 @@
"type": "github" "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": { "root": {
"inputs": { "inputs": {
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"mmsg": "mmsg",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"scenefx": "scenefx" "scenefx": "scenefx"
} }

7
flake.nix
View file

@ -2,10 +2,6 @@
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.url = "github:hercules-ci/flake-parts";
mmsg = {
url = "github:DreamMaoMao/mmsg";
inputs.nixpkgs.follows = "nixpkgs";
};
scenefx = { scenefx = {
url = "github:wlrfx/scenefx"; url = "github:wlrfx/scenefx";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -33,9 +29,7 @@
... ...
}: let }: let
inherit (pkgs) callPackage ; inherit (pkgs) callPackage ;
inherit (inputs.mmsg.packages.${pkgs.system}) mmsg;
mango = callPackage ./nix { mango = callPackage ./nix {
inherit mmsg;
inherit (inputs.scenefx.packages.${pkgs.system}) scenefx; inherit (inputs.scenefx.packages.${pkgs.system}) scenefx;
}; };
shellOverride = old: { shellOverride = old: {
@ -49,7 +43,6 @@
}; };
packages = { packages = {
inherit mango; inherit mango;
inherit mmsg;
}; };
devShells.default = mango.overrideAttrs shellOverride; devShells.default = mango.overrideAttrs shellOverride;
formatter = pkgs.alejandra; formatter = pkgs.alejandra;

4
nix/default.nix
View file

@ -16,7 +16,6 @@
enableXWayland ? true, enableXWayland ? true,
meson, meson,
ninja, ninja,
mmsg,
scenefx, scenefx,
wlroots_0_19, wlroots_0_19,
libGL, libGL,
@ -60,7 +59,6 @@ in
passthru = { passthru = {
providedSessions = ["mango"]; providedSessions = ["mango"];
inherit mmsg;
}; };
meta = { meta = {
@ -71,4 +69,4 @@ in
maintainers = []; maintainers = [];
platforms = lib.platforms.unix; platforms = lib.platforms.unix;
}; };
} }

7
nix/nixos-modules.nix
View file

@ -21,12 +21,7 @@ in {
environment.systemPackages = environment.systemPackages =
[ [
cfg.package cfg.package
] ];
++ (
if (builtins.hasAttr "mmsg" cfg.package)
then [cfg.package.mmsg]
else []
);
xdg.portal = { xdg.portal = {
enable = lib.mkDefault true; enable = lib.mkDefault true;