Fixed pnpm

darksoil-studio · Dec 19, 2024 · bd8275c · bd8275c
1 parent aced2f0
commit bd8275c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/crates/sync_npm_git_dependencies_with_nix/default.nix b/crates/sync_npm_git_dependencies_with_nix/default.nix
@@ -4,7 +4,9 @@
   perSystem = { inputs', pkgs, self', lib, ... }: {
 
     packages.sync-npm-git-dependencies-with-nix = let
-      craneLib = inputs.crane.mkLib pkgs;
+      # Uncomment this line when holonix gets updated to 24.11
+      # craneLib = inputs.crane.mkLib inputs'.pnpmnixpkgs.legacyPackages;
+      craneLib = inputs.crane.mkLib inputs'.pnpmnixpkgs.legacyPackages;
 
       cratePath = ./.;
 

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,7 +1,9 @@
 {
   inputs = {
-    nixpkgs.follows = "holonix/nixpkgs";
+    pnpmnixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
+
     holonix.url = "github:holochain/holonix/main-0.4";
+    nixpkgs.follows = "holonix/nixpkgs";
     rust-overlay.follows = "holonix/rust-overlay";
     crane.follows = "holonix/crane";
   };
@@ -230,7 +232,7 @@
 
         packages.synchronized-pnpm = pkgs.symlinkJoin {
           name = "synchronized-pnpm";
-          paths = [ inputs'.nixpkgs.legacyPackages.pnpm ];
+          paths = [ inputs'.pnpmnixpkgs.legacyPackages.pnpm ];
           buildInputs = [ pkgs.makeWrapper ];
           postBuild = ''
             wrapProgram $out/bin/pnpm  --run ${self'.packages.sync-npm-git-dependencies-with-nix}/bin/sync-npm-git-dependencies-with-nix