Unverified Commit a63a64b5 authored by Robert Schütz's avatar Robert Schütz Committed by GitHub
Browse files

Merge pull request #251705 from dotlambda/asar-buildNpmPackage 

asar: use buildNpmPackage
parents b9f22e15 745de518

pkgs/applications/editors/pulsar/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
, makeDesktopItem

, copyDesktopItems

, makeWrapper

, nodePackages

, asar

, python3

}:
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec { 
  nativeBuildInputs = [

    wrapGAppsHook

    copyDesktopItems

    nodePackages.asar

    asar

  ];



  buildInputs = [

pkgs/applications/editors/vscode/generic.nix

+2 −2
Original line number Diff line number Diff line
@@ -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; })

      ];

pkgs/applications/misc/teleprompter/default.nix

+2 −2
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, electron_10, makeDesktopItem, makeWrapper, nodePackages, autoPatchelfHook}:

{ lib, stdenv, fetchurl, electron_10, makeDesktopItem, makeWrapper, asar, autoPatchelfHook}:



let

  electron = electron_10;
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec { 
  dontBuild = true;

  dontStrip = true;



  nativeBuildInputs = [ autoPatchelfHook makeWrapper nodePackages.asar ];

  nativeBuildInputs = [ autoPatchelfHook makeWrapper asar ];

  installPhase = ''

    mkdir -p $out/bin $out/opt/teleprompter $out/share/applications

    asar e resources/app.asar $out/opt/teleprompter/resources/app.asar.unpacked

pkgs/applications/misc/whalebird/default.nix

+2 −2
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl

, autoPatchelfHook, makeDesktopItem, copyDesktopItems, makeWrapper, gnugrep, nodePackages

, autoPatchelfHook, makeDesktopItem, copyDesktopItems, makeWrapper, gnugrep, asar

, electron, python3, alsa-lib, gtk3, libdbusmenu, libxshmfence, mesa, nss

}:
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec { 
    makeWrapper

    copyDesktopItems

    gnugrep

    nodePackages.asar

    asar

  ];



  buildInputs = [ alsa-lib gtk3 libdbusmenu libxshmfence mesa nss ];

pkgs/applications/networking/breitbandmessung/default.nix

+2 −2
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchurl

, asar

, dpkg

, electron_24

, makeWrapper

, nixosTests

, nodePackages

, undmg

}:
@@ -22,9 +22,9 @@ let 
      };



      nativeBuildInputs = [

        asar

        dpkg

        makeWrapper

        nodePackages.asar

      ];



      unpackPhase = "dpkg-deb -x $src .";