Unverified Commit fcda7e48 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

electron{,-bin}: add passthru.dist attribute and use treewide (#313442)

parents 2c386cff e97d8f7e

pkgs/applications/audio/youtube-music/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -33,13 +33,13 @@ stdenv.mkDerivation (finalAttrs: { 
  ELECTRON_SKIP_BINARY_DOWNLOAD = 1;



  postBuild = lib.optionalString stdenv.isDarwin ''

    cp -R ${electron}/Applications/Electron.app Electron.app

    cp -R ${electron.dist}/Electron.app Electron.app

    chmod -R u+w Electron.app

  '' + ''

    pnpm build

    ./node_modules/.bin/electron-builder \

      --dir \

      -c.electronDist=${if stdenv.isDarwin then "." else "${electron}/libexec/electron"} \

      -c.electronDist=${if stdenv.isDarwin then "." else electron.dist} \

      -c.electronVersion=${electron.version}

  '';

pkgs/applications/graphics/drawio/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -63,14 +63,14 @@ stdenv.mkDerivation rec { 
    runHook preBuild



  '' + lib.optionalString stdenv.isDarwin ''

    cp -R ${electron}/Applications/Electron.app Electron.app

    cp -R ${electron.dist}/Electron.app Electron.app

    chmod -R u+w Electron.app

    export CSC_IDENTITY_AUTO_DISCOVERY=false

    sed -i "/afterSign/d" electron-builder-linux-mac.json

  '' + ''

    yarn --offline run electron-builder --dir \

      ${if stdenv.isDarwin then "--config electron-builder-linux-mac.json" else ""} \

      -c.electronDist=${if stdenv.isDarwin then "." else "${electron}/libexec/electron"} \

      ${lib.optionalString stdenv.isDarwin "--config electron-builder-linux-mac.json"} \

      -c.electronDist=${if stdenv.isDarwin then "." else electron.dist} \

      -c.electronVersion=${electron.version}



    runHook postBuild

pkgs/applications/misc/kuro/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec { 
  yarnBuildScript = "electron-builder";

  yarnBuildFlags = [

    "--dir"

    "-c.electronDist=${electron}/libexec/electron"

    "-c.electronDist=${electron.dist}"

    "-c.electronVersion=${electron.version}"

  ];

pkgs/applications/misc/whalebird/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec { 
    yarn run nextron build --no-pack

    yarn run electron-builder --dir \

      --config electron-builder.yml \

      -c.electronDist="${electron}/libexec/electron" \

      -c.electronDist="${electron.dist}" \

      -c.electronVersion=${electron.version}



    runHook postBuild

pkgs/applications/networking/instant-messengers/armcord/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec { 


    npm exec electron-builder -- \

      --dir \

      -c.electronDist="${electron_30}/libexec/electron" \

      -c.electronDist="${electron_30.dist}" \

      -c.electronVersion="${electron_30.version}"



    runHook postBuild