colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
drawio: fix darwin signing failure
This commit is contained in:
Emily Trau 2024-03-21 00:32:36 +11:00 committed by GitHub
commit c22bcf97e2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/graphics/drawio/default.nix
View File

@ -6,6 +6,7 @@
, copyDesktopItems , copyDesktopItems
, prefetch-yarn-deps , prefetch-yarn-deps
, makeWrapper , makeWrapper
, autoSignDarwinBinariesHook
, nodejs , nodejs
, yarn , yarn
, electron , electron
@ -23,6 +24,11 @@ stdenv.mkDerivation rec {
hash = "sha256-+TCnVXcmAEpa7MiL0dyeoh2aUfIIO8eze9pEaHgKnME="; 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 { offlineCache = fetchYarnDeps {
yarnLock = src + "/yarn.lock"; yarnLock = src + "/yarn.lock";
hash = "sha256-QS0bkDDQq3sn79TQ+pTZsmbmXgMccyLmlPLTsko7eGg="; hash = "sha256-QS0bkDDQq3sn79TQ+pTZsmbmXgMccyLmlPLTsko7eGg=";
@ -35,6 +41,8 @@ stdenv.mkDerivation rec {
yarn yarn
] ++ lib.optionals (!stdenv.isDarwin) [ ] ++ lib.optionals (!stdenv.isDarwin) [
copyDesktopItems copyDesktopItems
] ++ lib.optionals stdenv.isDarwin [
autoSignDarwinBinariesHook
]; ];
ELECTRON_SKIP_BINARY_DOWNLOAD = true; ELECTRON_SKIP_BINARY_DOWNLOAD = true;

4
pkgs/top-level/all-packages.nix
View File

@ -30749,7 +30749,9 @@ with pkgs;
drawing = callPackage ../applications/graphics/drawing { }; 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 { }; drawio-headless = callPackage ../applications/graphics/drawio/headless.nix { };
drawpile = libsForQt5.callPackage ../applications/graphics/drawpile { }; drawpile = libsForQt5.callPackage ../applications/graphics/drawpile { };