Unverified Commit c22bcf97 authored by Emily Trau's avatar Emily Trau Committed by GitHub
Browse files

Merge pull request #297089 from emilytrau/drawio-darwin-signing 

drawio: fix darwin signing failure
parents 5cffd60b 2ce73120

pkgs/applications/graphics/drawio/default.nix

+8 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
, copyDesktopItems

, prefetch-yarn-deps

, makeWrapper

, autoSignDarwinBinariesHook

, nodejs

, yarn

, electron
@@ -23,6 +24,11 @@ stdenv.mkDerivation rec { 
    hash = "sha256-+TCnVXcmAEpa7MiL0dyeoh2aUfIIO8eze9pEaHgKnME=";

  };



  # `@electron/fuses` tries to run `codesign` and fails. Disable and use autoSignDarwinBinariesHook instead

  postPatch = ''

    sed -i -e 's/resetAdHocDarwinSignature:.*/resetAdHocDarwinSignature: false,/' build/fuses.js

  '';



  offlineCache = fetchYarnDeps {

    yarnLock = src + "/yarn.lock";

    hash = "sha256-QS0bkDDQq3sn79TQ+pTZsmbmXgMccyLmlPLTsko7eGg=";
@@ -35,6 +41,8 @@ stdenv.mkDerivation rec { 
    yarn

  ] ++ lib.optionals (!stdenv.isDarwin) [

    copyDesktopItems

  ] ++ lib.optionals stdenv.isDarwin [

    autoSignDarwinBinariesHook

  ];



  ELECTRON_SKIP_BINARY_DOWNLOAD = true;

pkgs/top-level/all-packages.nix

+3 −1
Original line number Diff line number Diff line
@@ -30749,7 +30749,9 @@ with pkgs; 














  drawing = callPackage ../applications/graphics/drawing { };



























  drawio = callPackage ../applications/graphics/drawio { };













  drawio = callPackage ../applications/graphics/drawio {













    inherit (darwin) autoSignDarwinBinariesHook;













  };















  drawio-headless = callPackage ../applications/graphics/drawio/headless.nix { };





























  drawpile = libsForQt5.callPackage ../applications/graphics/drawpile { };