Overhaul nix flake (#279)

flake.lock

@@ -1,28 +1,12 @@
 {
   "nodes": {
-    "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1673956053,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1684585791,
+        "lastModified": 1712192574,
-        "narHash": "sha256-lYPboblKrchmbkGMoAcAivomiOscZCjtGxxTSCY51SM=",
+        "narHash": "sha256-LbbVOliJKTF4Zl2b9salumvdMXuQBr2kuKP5+ZwbYq4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "eea79d584eff53bf7a76aeb63f8845da6d386129",
+        "rev": "f480f9d09e4b4cf87ee6151eba068197125714de",
         "type": "github"
       },
       "original": {
@@ -34,7 +18,6 @@
     },
     "root": {
       "inputs": {
-        "flake-compat": "flake-compat",
         "nixpkgs": "nixpkgs"
       }
     }

flake.nix

@@ -1,73 +1,67 @@
 {
-  description = "swaywm development environment";
+  description = "Swayfx development environment";
-
+  inputs.nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-  inputs = {
+  outputs =
-    flake-compat = {
+    { self, nixpkgs, ... }:
-      url = "github:edolstra/flake-compat";
-      flake = false;
-    };
-
-    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-  };
-
-  outputs = { self, nixpkgs, flake-compat, ... }:
     let
-      pkgsFor = system:
+      pkgsFor = system: import nixpkgs { inherit system; };
-        import nixpkgs {
+      targetSystems = [
-          inherit system;
+        "aarch64-linux"
-          overlays = [ ];
+        "x86_64-linux"
-        };
-
-      targetSystems = [ "aarch64-linux" "x86_64-linux" ];
-    in
-    {
-      overlays.default = final: prev: {
-        swayfx-unwrapped = prev.sway-unwrapped.overrideAttrs (old: {
-          src = builtins.path { path = prev.lib.cleanSource ./.; };
-          patches =
-            let
-              removePatches = [
-                "LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM.patch"
       ];
-            in
+      mkPackage = pkgs: {
-            builtins.filter
+        swayfx-unwrapped =
-              (patch: !builtins.elem (patch.name or null) removePatches)
+          (pkgs.swayfx-unwrapped.override {
-              (old.patches or [ ]);
+            # When the sway 1.9 rebase is finished, this will need to be overridden.
+            # wlroots_0_16 = pkgs.wlroots_0_16;
+          }).overrideAttrs
+            (old: {
+              version = "0.3.2-git";
+              src = pkgs.lib.cleanSource ./.;
             });
       };
+    in
+    {
+      overlays = rec {
+        default = override;
+        # Override onto the input nixpkgs
+        override = _: prev: mkPackage prev;
+        # Insert using the locked nixpkgs
+        insert = _: prev: mkPackage (pkgsFor prev.system);
+      };
 
-      packages = nixpkgs.lib.genAttrs targetSystems (system:
+      packages = nixpkgs.lib.genAttrs targetSystems (
-        let pkgs = pkgsFor system;
+        system: (mkPackage (pkgsFor system) // { default = self.packages.${system}.swayfx-unwrapped; })
-        in (self.overlays.default pkgs pkgs) // {
+      );
-          default = self.packages.${system}.swayfx-unwrapped;
-        });
 
-      devShells = nixpkgs.lib.genAttrs targetSystems (system:
+      devShells = nixpkgs.lib.genAttrs targetSystems (
+        system:
         let
           pkgs = pkgsFor system;
         in
         {
           default = pkgs.mkShell {
             name = "swayfx-shell";
-            depsBuildBuild = with pkgs; [ pkg-config ];
+            inputsFrom = [
-            inputsFrom = [ self.packages.${system}.swayfx-unwrapped pkgs.wlroots_0_16 ];
+              self.packages.${system}.swayfx-unwrapped
-
+              pkgs.wlroots_0_16
+            ];
             nativeBuildInputs = with pkgs; [
               cmake
-              meson
-              ninja
-              pkg-config
               wayland-scanner
-              scdoc
-              hwdata # for wlroots
             ];
-
+            # Copy the nix version of wlroots into the project
-            shellHook = with pkgs; ''(
+            shellHook = with pkgs; ''
-              mkdir -p "$PWD/subprojects"
+              (
-              cd "$PWD/subprojects"
+                mkdir -p "$PWD/subprojects" && cd "$PWD/subprojects"
                 cp -R --no-preserve=mode,ownership ${wlroots_0_16.src} wlroots
               )'';
           };
+        }
+      );
+
+      formatter = nixpkgs.lib.genAttrs targetSystems (system: {
+        default = (pkgsFor system).nixfmt-rfc-style;
       });
     };
 }