Merge pull request #282667 from wegank/pageedit-refactor

pageedit: fix build on x86_64-darwin, refactor
This commit is contained in:
Weijia Wang 2024-01-23 18:24:55 +01:00 committed by GitHub
commit 3c70df60b8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 1 deletions

View File

@ -777,6 +777,7 @@ mapAliases ({
### P ###
packet-cli = metal-cli; # Added 2021-10-25
PageEdit = pageedit; # Added 2024-01-21
palemoon = throw "palemoon has been dropped due to python2 being EOL and marked insecure. Use 'palemoon-bin' instead"; # Added 2023-05-18
paperless = paperless-ngx; # Added 2021-06-06
paperless-ng = paperless-ngx; # Added 2022-04-11

View File

@ -11821,7 +11821,9 @@ with pkgs;
page = callPackage ../tools/misc/page { };
PageEdit = libsForQt5.callPackage ../applications/office/PageEdit { };
pageedit = libsForQt5.callPackage ../applications/office/PageEdit {
stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
};
pagefind = libsForQt5.callPackage ../applications/misc/pagefind { };