diff options
| author | Travis A. Everett <travis.a.everett@gmail.com> | 2024-04-07 14:46:28 -0500 |
|---|---|---|
| committer | Travis A. Everett <travis.a.everett@gmail.com> | 2024-04-07 15:14:37 -0500 |
| commit | f318c22bbe648729d0a9adf26bd9d387f1fb42b2 (patch) | |
| tree | ccc6f8d4826bb7c65de21f00294e1988bd0565b1 | |
| parent | Merge pull request #301724 from r-ryantm/auto-update/mailpit (diff) | |
| download | nixpkgs-f318c22bbe648729d0a9adf26bd9d387f1fb42b2.tar.gz | |
pdfmm: fix build on (at least) macOS
The package isn't marked linux-only, but pulling locale from
glibc effectively limited it to linux. Using the generalized
locale attr gets it building on macOS.
Also:
- While looking into this, I noticed that the script only
uses xmessage if zenity isn't present, so I think we can
drop that dependency.
- Not super familiar with what the package should run on,
but I went ahead and set the platform meta based on what
I've personally verified.
| -rw-r--r-- | pkgs/applications/office/pdfmm/default.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/applications/office/pdfmm/default.nix b/pkgs/applications/office/pdfmm/default.nix index 08dd9eea9bbd..5be76fa51685 100644 --- a/pkgs/applications/office/pdfmm/default.nix +++ b/pkgs/applications/office/pdfmm/default.nix @@ -2,12 +2,11 @@ , coreutils , fetchFromGitHub , ghostscript -, glibc +, locale , gnome , gnused , lib , resholve -, xorg }: resholve.mkDerivation rec { @@ -35,15 +34,16 @@ resholve.mkDerivation rec { inputs = [ coreutils ghostscript - glibc + locale gnome.zenity gnused - xorg.xmessage ]; + fake = { + # only need xmessage if zenity is unavailable + external = [ "xmessage" ]; + }; execer = [ - "cannot:${glibc.bin}/bin/locale" "cannot:${gnome.zenity}/bin/zenity" - "cannot:${xorg.xmessage}/bin/xmessage" ]; keep."$toutLu" = true; }; @@ -54,5 +54,6 @@ resholve.mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ urandom ]; mainProgram = "pdfmm"; + platforms = platforms.linux ++ platforms.darwin; }; } |
