nix: non-flake shell, move to crane

Author: algorithmiker

.envrc

@@ -1 +1 @@
-use flake
+use nix

.github/workflows/test.yml

@@ -10,4 +10,6 @@ jobs:
     - uses: cachix/install-nix-action@v31
       with:
         nix_path: nixpkgs=channel:nixos-unstable
-    - run: nix build -v -L
+    - run: nix build -v -L .#entrace
+    - run: nix build -v -L .#entrace_core
+    - run: nix build -v -L .#entrace_core_lite

.gitignore

@@ -4,4 +4,5 @@
 *.et
 *.iet
 **/**.et
-.direnv
+.direnv
+result

flake.lock

@@ -4,13 +4,15 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
     fenix.url = "github:nix-community/fenix/monthly";
+    crane.url = "github:ipetkov/crane";
   };
 
   outputs =
     {
       self,
       nixpkgs,
       fenix,
+      crane,
     }:
     let
       systems = nixpkgs.lib.systems.flakeExposed;
@@ -20,34 +22,65 @@
       system:
       let
         pkgs = nixpkgs.legacyPackages.${system};
-        rustfmt_nightly = fenix.packages.${system}.default.rustfmt;
+        rustfmt-nightly = fenix.packages.${system}.default.rustfmt;
+        craneLib = crane.mkLib pkgs;
+        rpath-libs = [
+          pkgs.libGL
+          pkgs.libxkbcommon
+          pkgs.wayland
+          pkgs.luajit
+        ];
+        craneCommonArgs = {
+          pname = "entrace";
+          version = "0.1.1";
+          src = pkgs.lib.fileset.toSource {
+            root = ./.;
+            fileset = pkgs.lib.fileset.unions [
+              (craneLib.fileset.commonCargoSources ./.)
+              (pkgs.lib.fileset.fileFilter (file: file.hasExt "md") ./.)
+              (pkgs.lib.fileset.maybeMissing ./gui/vendor)
+              (pkgs.lib.fileset.maybeMissing ./docs)
+            ];
+          };
+          buildInputs = [ ] ++ rpath-libs;
+          nativeBuildInputs = [
+            pkgs.breakpointHook
+            pkgs.mold-wrapped
+            pkgs.patchelf
+            pkgs.pkg-config
+          ];
+        };
+        cargoArtifacts = craneLib.buildDepsOnly craneCommonArgs;
+        craneWithCommonArgs =
+          x: craneLib.buildPackage (craneCommonArgs // { inherit cargoArtifacts; } // x);
+        entraceApp = craneWithCommonArgs {
+          pname = "entrace";
+          cargoExtraArgs = "-p entrace";
+          postFixup = ''
+            ENTRACE_BIN="$out/bin/entrace"
+            patchelf --add-rpath ${pkgs.lib.makeLibraryPath rpath-libs} "$ENTRACE_BIN"
+            patchelf \
+              --add-needed libwayland-client.so \
+              --add-needed libxkbcommon.so \
+              --add-needed libEGL.so \
+              --add-needed libluajit-5.1.so "$ENTRACE_BIN"
+          '';
+        };
       in
       {
-        devShells.${system}.default =
-          let
-            libPathPackages = [
-              pkgs.wayland
-              pkgs.libxkbcommon
-              pkgs.libGL
-            ];
-            _libPathPackagesStr = builtins.toString (pkgs.lib.makeLibraryPath libPathPackages);
-          in
-          pkgs.mkShell {
-            packages = libPathPackages ++ [
-              pkgs.sqlite
-              pkgs.mold-wrapped
-              pkgs.pkg-config
-              pkgs.luajit
-              pkgs.zenity
-              rustfmt_nightly
-              pkgs.cargo-about
-            ];
-            env.RUSTFLAGS = "-C link-arg=-fuse-ld=mold";
-            shellHook = ''
-              export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${_libPathPackagesStr}"
-            '';
+        devShells.${system}.default = import ./shell.nix { inherit pkgs rustfmt-nightly; };
+        packages.${system} = {
+          default = entraceApp;
+          entrace = entraceApp;
+          entrace_core = craneWithCommonArgs {
+            pname = "entrace_core";
+            cargoExtraArgs = "-p entrace_core";
+          };
+          entrace_core_lite = craneCommonArgs {
+            pname = "entrace_core_lite";
+            cargoExtraArgs = "-p entrace_core --no-default-features";
           };
-        packages.${system}.default = pkgs.callPackage ./package.nix { };
+        };
       }
     );
 }

flake.nix

@@ -0,0 +1,27 @@
+{
+  pkgs ? import <nixpkgs> { },
+  rustfmt-nightly ? pkgs.rustfmt,
+}:
+
+let
+  libPathPackages = [
+    pkgs.wayland
+    pkgs.libxkbcommon
+    pkgs.libGL
+  ];
+in
+pkgs.mkShell {
+  packages = libPathPackages ++ [
+    pkgs.sqlite
+    pkgs.mold-wrapped
+    pkgs.pkg-config
+    pkgs.luajit
+    pkgs.zenity
+    rustfmt-nightly
+    pkgs.cargo-about
+  ];
+  env.RUSTFLAGS = "-C link-arg=-fuse-ld=mold";
+  shellHook = ''
+    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${pkgs.lib.makeLibraryPath libPathPackages}"
+  '';
+}