mate.atril: add support for more filetypes #93851
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
romildo
requested changes
Jul 25, 2020
| (optionals (enablePostScript) libspectre) | ||
| (optionals (enableXps) libgxps) | ||
| ]; | ||
|
|
There was a problem hiding this comment.
optionals always returns a list. When its condition is false, the list is empty. Otherwise it has one element. Therefore it is not approppriate inside the list of build dependences. Instead the result of optionals should be appended to a list with the other elements.
Something like this:
buildInputs = [
gtk3
glib
itstool
libsecret
libxml2
poppler
mate.caja
mate.mate-desktop
hicolor-icon-theme
texlive.bin.core # for synctex, used by the pdf back-end
]
++ optionals enableDjvu djvulibre
++ optionals enableEpub webkitgtk
++ optionals enablePostScript libspectre
++ optionals enableXps libgxps
;optionals is documented at https://nixos.org/nixpkgs/manual/#sec-functions-library
pkgs/desktops/mate/atril/default.nix
Outdated
| (optionals (enableEpub) "--enable-epub") | ||
| (optionals (enablePostScript) "--enable-ps") | ||
| (optionals (enableXps) "--enable-xps") | ||
| (optionals (enableImages) "--enable-pixbuf") | ||
| ]; |
There was a problem hiding this comment.
Again optionals should not be used inside a list, but apeended.
romildo
approved these changes
Jul 26, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Atril was built without support for some filetypes.
This PR adds (enabled by default) support for djvu, epub, postscript and xps, plus (disabled by default) for images.
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)