Merge pull request #113 from Artturin/nixbundleapi

flake: Use new nix bundle api

Author: Artturin

default.nix

@@ -13,9 +13,12 @@ rec {
     # in the context automatically.
     else "${target}";
 
-  arx = { archive, startup}:
+  arx = { drvToBundle, archive, startup}:
     stdenv.mkDerivation {
-      name = "arx";
+      name = if drvToBundle != null then "${drvToBundle.pname}-arx" else "arx";
+      passthru = {
+        inherit drvToBundle;
+      };
       buildCommand = ''
         # tmpdir has a additional `/` in the beginning to work around `QualifiedPath` checking for `|/|./|../|`
         ${haskellPackages.arx}/bin/arx tmpx \
@@ -78,9 +81,9 @@ rec {
     meta.platforms = lib.platforms.linux;
   };
 
-  makebootstrap = { targets, startup }:
+  makebootstrap = { targets, startup, drvToBundle ? null }:
     arx {
-      inherit startup;
+      inherit drvToBundle startup;
       archive = maketar {
         inherit targets;
       };

flake.lock

@@ -1,26 +1,55 @@
 {
   description = "The purely functional package manager";
 
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    utils.url = "github:numtide/flake-utils";
+  };
 
-  outputs = { self, nixpkgs }: let
-    systems = [ "x86_64-linux" "i686-linux" "aarch64-linux" ];
-    forAllSystems = f: nixpkgs.lib.genAttrs systems (system: f system);
-  in {
-    bundlers = {
-      nix-bundle = { program, system }: let
-        nixpkgs' = nixpkgs.legacyPackages.${system};
-        nix-bundle = import self { nixpkgs = nixpkgs'; };
-        script = nixpkgs'.writeScript "startup" ''
-          #!/bin/sh
-          .${nix-bundle.nix-user-chroot}/bin/nix-user-chroot -n ./nix -- ${program} "$@"
-        '';
-      in nix-bundle.makebootstrap {
-        targets = [ script ];
-        startup = ".${builtins.unsafeDiscardStringContext script} '\"$@\"'";
-      };
-    };
+  outputs =
+    inputs:
+    let
+      inherit (inputs.nixpkgs) lib;
 
-    defaultBundler = self.bundlers.nix-bundle;
-  };
+      getExe =
+        x:
+        lib.getExe' x (
+          x.meta.mainProgram or (lib.warn
+            "nix-bundle: Package ${
+              lib.strings.escapeNixIdentifier x.meta.name or x.pname or x.name
+            } does not have the meta.mainProgram attribute. Assuming you want '${lib.getName x}'."
+            lib.getName
+            x
+          )
+        );
+    in
+    inputs.utils.lib.eachDefaultSystem (
+      system:
+      let
+        nix-bundle-fun =
+          {
+            drv,
+            programPath ? getExe drv,
+          }:
+          let
+            nixpkgs = inputs.nixpkgs.legacyPackages.${system};
+            nix-bundle = import inputs.self { inherit nixpkgs; };
+            script = nixpkgs.writeScript "startup" ''
+              #!/bin/sh
+              .${nix-bundle.nix-user-chroot}/bin/nix-user-chroot -n ./nix -- ${programPath} "$@"
+            '';
+          in
+          nix-bundle.makebootstrap {
+            drvToBundle = drv;
+            targets = [ script ];
+            startup = ".${builtins.unsafeDiscardStringContext script} '\"$@\"'";
+          };
+      in
+      {
+        bundlers = {
+          default = inputs.self.bundlers.${system}.nix-bundle;
+          nix-bundle = drv: nix-bundle-fun { inherit drv; };
+        };
+      }
+    );
 }