Merge pull request #328167 from reckenrode/node2nix-cctools

nodePackages.node2nix: use top-level cctools in generated files
This commit is contained in:
Emily 2024-07-26 22:35:15 +01:00 committed by GitHub
commit ab13e5e5b9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -204,6 +204,11 @@ final: prev: {
url = "https://github.com/svanderburg/node2nix/commit/3b63e735458947ef39aca247923f8775633363e5.patch";
hash = "sha256-pe8Xm4mjPh9oKXugoMY6pRl8YYgtdw0sRXN+TienalU=";
})
# Use top-level cctools in generated files - PR svanderburg/node2nix#334
(fetchpatch {
url = "https://github.com/svanderburg/node2nix/commit/31c308bba5f39ea0105f66b9f40dbe57fed7a292.patch";
hash = "sha256-DdNRteonMvyffPh0uo0lUbsohKYnyqv0QcD9vjN6aXE=";
})
];
in ''
${lib.concatStringsSep "\n" (map (patch: "patch -d $out/lib/node_modules/node2nix -p1 < ${patch}") patches)}