diff options
author | Robert Schütz <nix@dotlambda.de> | 2023-08-30 00:25:28 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-30 00:25:28 +0000 |
commit | a63a64b593dcf2fe05f7c5d666eb395950f36bc9 (patch) | |
tree | 76904aaed28aecd7f91098de319fbd0a18029e0d /pkgs/applications/editors | |
parent | b9f22e151b62b3e80545fe50168b98ef93840185 (diff) | |
parent | 745de518cd1e93b8ef7a4090aced2cb447f599bb (diff) |
Merge pull request #251705 from dotlambda/asar-buildNpmPackage
asar: use buildNpmPackage
Diffstat (limited to 'pkgs/applications/editors')
-rw-r--r-- | pkgs/applications/editors/pulsar/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/editors/vscode/generic.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/editors/pulsar/default.nix b/pkgs/applications/editors/pulsar/default.nix index f376cff4a97fa..e0b967f8043c3 100644 --- a/pkgs/applications/editors/pulsar/default.nix +++ b/pkgs/applications/editors/pulsar/default.nix @@ -17,7 +17,7 @@ , makeDesktopItem , copyDesktopItems , makeWrapper -, nodePackages +, asar , python3 }: @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ wrapGAppsHook copyDesktopItems - nodePackages.asar + asar ]; buildInputs = [ diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 1742c1e0a0af2..39e4fbc966d72 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -8,7 +8,7 @@ , tests # needed to fix "Save as Root" -, nodePackages, bash +, asar, bash # Attributes inherit from specific versions , version, src, meta, sourceRoot, commandLineArgs @@ -74,7 +74,7 @@ let nativeBuildInputs = [ unzip ] ++ lib.optionals stdenv.isLinux [ autoPatchelfHook - nodePackages.asar + asar # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651 (buildPackages.wrapGAppsHook.override { inherit (buildPackages) makeWrapper; }) ]; |