From dd950cfcfd2c33a7bb3944e82ca0477c82606404 Mon Sep 17 00:00:00 2001
From: Matej Urbas <matej.urbas@gmail.com>
Date: Fri, 22 Mar 2024 19:48:39 +0000
Subject: [PATCH] fixup! fixup! fixup! wip

---
 flake.lock                        | 33 +------------------------------
 flake.nix                         |  6 +++---
 nixjs-rt/README.md                |  2 +-
 nixjs-rt/scripts/check-nix-pkg.sh |  2 +-
 4 files changed, 6 insertions(+), 37 deletions(-)

diff --git a/flake.lock b/flake.lock
index dd0e51f..f5282e6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,36 +1,6 @@
 {
   "nodes": {
-    "nixjs-rt": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      },
-      "locked": {
-        "lastModified": 1,
-        "narHash": "sha256-Rg+3zU7vqZQU77WoqlDG8agrE6iGcB/A/5S00KMhfh0=",
-        "path": "./nixjs-rt",
-        "type": "path"
-      },
-      "original": {
-        "path": "./nixjs-rt",
-        "type": "path"
-      }
-    },
     "nixpkgs": {
-      "locked": {
-        "lastModified": 1707451808,
-        "narHash": "sha256-UwDBUNHNRsYKFJzyTMVMTF5qS4xeJlWoeyJf+6vvamU=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "442d407992384ed9c0e6d352de75b69079904e4e",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixpkgs-unstable",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_2": {
       "locked": {
         "lastModified": 1710827359,
         "narHash": "sha256-/KY8hffTh9SN/tTcDn/FrEiYwTXnU8NKnr4D7/stmmA=",
@@ -47,8 +17,7 @@
     },
     "root": {
       "inputs": {
-        "nixjs-rt": "nixjs-rt",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index 492756d..ae58514 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,9 +2,8 @@
   description = "A reimplementation or nix in Rust.";
 
   inputs.nixpkgs.url = "nixpkgs/nixpkgs-unstable";
-  inputs.nixjs-rt.url = "path:./nixjs-rt";
 
-  outputs = { self, nixpkgs, nixjs-rt }:
+  outputs = { self, nixpkgs }:
     let
       supportedSystems = [ "x86_64-linux" "aarch64-linux" ];
       forSupportedSystems = f: with nixpkgs.lib; foldl' (resultAttrset: system: recursiveUpdate resultAttrset (f { inherit system; pkgs = import nixpkgs { inherit system; }; })) { } supportedSystems;
@@ -17,7 +16,6 @@
           coreutils
           cargo-watch
           nix
-          nixjs-rt.packages.${system}.default
           nixpkgs-fmt
           rustup
         ];
@@ -28,6 +26,8 @@
           prefetch-npm-deps
         ];
 
+        nixjs-rt = import ./nixjs-rt/pkg.nix { inherit pkgs; self = "${self}/nixjs-rt"; };
+
       in
       {
         packages.${system} = { inherit nixjs-rt pkgs; };
diff --git a/nixjs-rt/README.md b/nixjs-rt/README.md
index ddb926d..e7c51d6 100644
--- a/nixjs-rt/README.md
+++ b/nixjs-rt/README.md
@@ -1,4 +1,4 @@
-# nixjs-rt [![builder](https://github.com/urbas/nixjs-rt/actions/workflows/build.yml/badge.svg)](https://github.com/urbas/nixjs-rt/actions/workflows/build.yml)
+# nixjs-rt
 
 Nix JavaScript Run-time, an implementation of nix language semantics in TypeScript.
 
diff --git a/nixjs-rt/scripts/check-nix-pkg.sh b/nixjs-rt/scripts/check-nix-pkg.sh
index 8176c3d..ccad913 100755
--- a/nixjs-rt/scripts/check-nix-pkg.sh
+++ b/nixjs-rt/scripts/check-nix-pkg.sh
@@ -3,7 +3,7 @@
 set -e
 
 outLink=$(mktemp -d)/result
-nix build --out-link $outLink
+nix build --out-link $outLink ..#nixjs-rt
 
 function expectFile() {
   local theFile=$1