Merge pull request #507 from Rexcrazy804/nix-patches

Improvements to nix derrivation

nix/default.nix

@@ -13,60 +13,64 @@
   wayland-scanner,
   xcbutilwm,
   xwayland,
-  enableXWayland ? true,
   meson,
   ninja,
   scenefx,
   wlroots_0_19,
   libGL,
-}: let
+  enableXWayland ? true,
+  debug ? false,
+}:
+stdenv.mkDerivation {
   pname = "mango";
-in
+  version = "nightly";
-  stdenv.mkDerivation {
-    inherit pname;
-    version = "nightly";
 
-    src = builtins.path {
+  src = builtins.path {
-      path = ../.;
+    path = ../.;
-      name = "source";
+    name = "source";
-    };
+  };
 
-    nativeBuildInputs = [
+  mesonFlags = [
-      meson
+    (lib.mesonEnable "xwayland" enableXWayland)
-      ninja
+    (lib.mesonBool "asan" debug)
-      pkg-config
+  ];
-      wayland-scanner
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    wayland-scanner
+  ];
+
+  buildInputs =
+    [
+      libinput
+      libxcb
+      libxkbcommon
+      pcre2
+      pixman
+      wayland
+      wayland-protocols
+      wlroots_0_19
+      scenefx
+      libGL
+    ]
+    ++ lib.optionals enableXWayland [
+      libX11
+      xcbutilwm
+      xwayland
     ];
 
-    buildInputs =
+  passthru = {
-      [
+    providedSessions = ["mango"];
-        libinput
+  };
-        libxcb
-        libxkbcommon
-        pcre2
-        pixman
-        wayland
-        wayland-protocols
-        wlroots_0_19
-        scenefx
-        libGL
-      ]
-      ++ lib.optionals enableXWayland [
-        libX11
-        xcbutilwm
-        xwayland
-      ];
 
-    passthru = {
+  meta = {
-      providedSessions = ["mango"];
+    mainProgram = "mango";
-    };
+    description = "A streamlined but feature-rich Wayland compositor";
-
+    homepage = "https://github.com/DreamMaoMao/mango";
-    meta = {
+    license = lib.licenses.gpl3Plus;
-      mainProgram = "mango";
+    maintainers = [];
-      description = "A streamlined but feature-rich Wayland compositor";
+    platforms = lib.platforms.unix;
-      homepage = "https://github.com/DreamMaoMao/mango";
+  };
-      license = lib.licenses.gpl3Plus;
+}
-      maintainers = [];
-      platforms = lib.platforms.unix;
-    };
-  }