Refactor flake for overridability, conditional service install, version formatting (#65)

* Refactor flake for overridability, conditional service install, version formatting

* Disable default cargo features for the flake package

Co-authored-by: sodiboo <37938646+sodiboo@users.noreply.github.com>

* Replace deprecated `--replace` with `--replace-fail` in the flake package

Co-authored-by: sodiboo <37938646+sodiboo@users.noreply.github.com>

* Remove `unstable` from flake package version

Co-authored-by: sodiboo <37938646+sodiboo@users.noreply.github.com>

* Refactor flake to enable dependency overridability

* Pass lib explicitly in flake package

* Fix incorrect package path in flake package dependency

* Replace makeWrapper with makeBinaryWrapper

* Enhance build by separating substitution, service install, and wrapping

* Remove redundant arguments from package call

---------

Co-authored-by: sodiboo <37938646+sodiboo@users.noreply.github.com>

flake.nix

@@ -6,46 +6,83 @@
       url = "github:oxalica/rust-overlay";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    naersk.url = "github:nix-community/naersk";
   };
 
-  outputs = { self, nixpkgs, rust-overlay, naersk, flake-utils }:
+  outputs = { self, nixpkgs, rust-overlay, flake-utils }:
     let systems = [ "x86_64-linux" "aarch64-linux" ];
     in flake-utils.lib.eachSystem systems (system:
       let
         overlays = [ (import rust-overlay) ];
         pkgs = import nixpkgs { inherit system overlays; };
-        lib = pkgs.lib;
 
-        naersk' = pkgs.callPackage naersk {
+        cargoToml = builtins.fromTOML (builtins.readFile ./Cargo.toml);
-          cargo = pkgs.rust-bin.stable.latest.default;
+        cargoPackageVersion = cargoToml.package.version;
-          rustc = pkgs.rust-bin.stable.latest.default;
+
+        commitHash = self.shortRev or self.dirtyShortRev or "unknown";
+
+        version = "${cargoPackageVersion}-${commitHash}";
+
+        buildXwaylandSatellite =
+          { lib
+          , rustPlatform
+          , pkg-config
+          , makeBinaryWrapper
+          , libxcb
+          , xcb-util-cursor
+          , xwayland
+          , withSystemd ? true
+          }:
+
+          rustPlatform.buildRustPackage rec {
+            pname = "xwayland-satellite";
+            inherit version;
+
+            src = self;
+
+            cargoLock = {
+              lockFile = "${src}/Cargo.lock";
+              allowBuiltinFetchGit = true;
             };
 
-        buildXwaylandSatellite = { withSystemd ? false }: naersk'.buildPackage {
+            nativeBuildInputs = [
-          src = ./.;
-
-          nativeBuildInputs = with pkgs; [
               rustPlatform.bindgenHook
-            rust-bin.stable.latest.default
               pkg-config
+              makeBinaryWrapper
+            ];
 
+            buildInputs = [
+              libxcb
               xcb-util-cursor
-            xorg.libxcb
+            ];
 
-            makeWrapper
+            buildNoDefaultFeatures = true;
-          ] ++ lib.optional withSystemd pkgs.systemd;
+            buildFeatures = lib.optionals withSystemd [ "systemd" ];
 
-          buildInputs = [ pkgs.xwayland ];
+            postPatch = ''
-
+              substituteInPlace resources/xwayland-satellite.service \
-          cargoBuildOptions = opts: opts ++ lib.optional withSystemd "--features systemd";
+                --replace-fail '/usr/local/bin' "$out/bin"
-
-          postInstall = ''
-            wrapProgram $out/bin/xwayland-satellite \
-              --prefix PATH : ${pkgs.xwayland}/bin
             '';
+
+            postInstall = lib.optionalString withSystemd ''
+              install -Dm0644 resources/xwayland-satellite.service -t $out/lib/systemd/user
+            '';
+
+            postFixup = ''
+              wrapProgram $out/bin/xwayland-satellite \
+                --prefix PATH : "${lib.makeBinPath [ xwayland ]}"
+            '';
+
+            doCheck = false;
+
+            meta = with lib; {
+              description = "Xwayland outside your Wayland";
+              homepage = "https://github.com/Supreeeme/xwayland-satellite";
+              license = licenses.mpl20;
+              platforms = platforms.linux;
+            };
           };
 
+        xwayland-satellite = pkgs.callPackage buildXwaylandSatellite { };
       in
       {
         devShell = (pkgs.mkShell.override { stdenv = pkgs.clangStdenv; }) {
@@ -60,11 +97,8 @@
           ];
         };
 
-        packages = rec {
+        packages = {
-          xwayland-satellite-nosd = buildXwaylandSatellite { withSystemd = false; };
+          xwayland-satellite = xwayland-satellite;
-
-          xwayland-satellite = buildXwaylandSatellite { withSystemd = true; };
-
           default = xwayland-satellite;
         };
       });