Ensure parity between nix-shell and nix-build for vercel pkg

Author: CMCDragonkai

package-lock.json

@@ -45,7 +45,7 @@
     "eslint-plugin-prettier": "^3.3.1",
     "jest": "^26.6.3",
     "jest-mock-process": "^1.4.0",
-    "pkg": "5.3.1",
+    "pkg": "5.3.0",
     "prettier": "^2.2.1",
     "ts-jest": "^26.4.4",
     "ts-node": "^9.1.1",

package.json

@@ -2,19 +2,14 @@
 
 with pkgs;
 let
-  pkg = pkgs.nodePackages.pkg.override {
-    postFixup = ''
-      patch -p0 < ${./nix/leveldown.patch}
-    '';
-  };
   utils = callPackage ./utils.nix {};
   buildElf = arch:
     stdenv.mkDerivation rec {
       name = "${utils.basename}-${version}-linux-${arch}";
       version = utils.node2nixDev.version;
       src = "${utils.node2nixDev}/lib/node_modules/${utils.node2nixDev.packageName}";
       buildInputs = [
-        pkg
+        utils.pkg
       ];
       PKG_CACHE_PATH = utils.pkgCachePath;
       PKG_IGNORE_TAG = 1;
@@ -40,7 +35,7 @@ let
       version = utils.node2nixDev.version;
       src = "${utils.node2nixDev}/lib/node_modules/${utils.node2nixDev.packageName}";
       buildInputs = [
-        pkg
+        utils.pkg
       ];
       PKG_CACHE_PATH = utils.pkgCachePath;
       PKG_IGNORE_TAG = 1;
@@ -65,7 +60,7 @@ let
       version = utils.node2nixDev.version;
       src = "${utils.node2nixDev}/lib/node_modules/${utils.node2nixDev.packageName}";
       buildInputs = [
-        pkg
+        utils.pkg
       ];
       PKG_CACHE_PATH = utils.pkgCachePath;
       PKG_IGNORE_TAG = 1;

release.nix

@@ -1,22 +1,39 @@
 { pkgs ? import ./pkgs.nix {} }:
 
 with pkgs;
-pkgs.mkShell {
-  nativeBuildInputs = [
-    nodejs
-    nodePackages.node2nix
-  ];
-  shellHook = ''
-    echo 'Entering Typescript-Demo-Lib'
-    set -o allexport
-    . ./.env
-    set +o allexport
-    set -v
+let
+  utils = callPackage ./utils.nix {};
+in
+  pkgs.mkShell {
+    nativeBuildInputs = [
+      nodejs
+      nodePackages.node2nix
+      utils.pkg
+    ];
+    PKG_CACHE_PATH = utils.pkgCachePath;
+    PKG_IGNORE_TAG = 1;
+    # ensure that native modules are built from source
+    npm_config_build_from_source = "true";
+    shellHook = ''
+      echo 'Entering Typescript-Demo-Lib'
+      set -o allexport
+      . ./.env
+      set +o allexport
+      set -v
 
-    export PATH="$(pwd)/dist/bin:$(npm bin):$PATH"
-    npm install
-    mkdir --parents "$(pwd)/tmp"
+      export PATH="$(pwd)/dist/bin:$(npm bin):$PATH"
 
-    set +v
-  '';
-}
+      # pkg is installed in package.json
+      # this ensures that in nix-shell we are using the nix packaged versions
+      export PATH="${lib.makeBinPath
+        [
+          utils.pkg
+        ]
+      }:$PATH"
+
+      npm install
+      mkdir --parents "$(pwd)/tmp"
+
+      set +v
+    '';
+  }

shell.nix

@@ -82,4 +82,9 @@ rec {
             path = pkgBuild.macos-x64;
           }
         ];
+  pkg = pkgs.nodePackages.pkg.override {
+    postFixup = ''
+      patch -p0 < ${./nix/leveldown.patch}
+    '';
+  };
 }