From 02d65c33e44666df9124854314266c98e63bfa09 Mon Sep 17 00:00:00 2001
From: ProggerX <x@proggers.ru>
Date: Sat, 18 Oct 2025 09:46:18 +0300
Subject: [PATCH] nix: merge mmsg to mangowc project

---
 flake.lock            | 55 -------------------------------------------
 flake.nix             |  7 ------
 nix/default.nix       |  4 +---
 nix/nixos-modules.nix |  7 +-----
 4 files changed, 2 insertions(+), 71 deletions(-)

diff --git a/flake.lock b/flake.lock
index 28a8ac6..2917a6f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -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"
       }
diff --git a/flake.nix b/flake.nix
index a3bd8e6..ff88ba0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -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;
diff --git a/nix/default.nix b/nix/default.nix
index 37bff52..b72977d 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -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;
     };
-  }
\ No newline at end of file
+  }
diff --git a/nix/nixos-modules.nix b/nix/nixos-modules.nix
index 0cae15c..9e73d6a 100644
--- a/nix/nixos-modules.nix
+++ b/nix/nixos-modules.nix
@@ -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;