Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

inkscape: use latest poppler, use gtkspell2, drop -fpermissive #72491

Merged
merged 1 commit into from Nov 3, 2019
Merged

inkscape: use latest poppler, use gtkspell2, drop -fpermissive #72491

merged 1 commit into from Nov 3, 2019

Conversation

urkud
Copy link
Contributor

@urkud urkud commented Nov 1, 2019

It seems that inkscape-0.9.4 builds with the latest poppler and
without the -fpermissive workaround.

Motivation for this change

Cleanup.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @7c6f434c (added -fpermissive and poppler = poppler_0_61); no meta.maintainer.

@urkud
Copy link
Contributor Author

urkud commented Nov 2, 2019

Do we have a working gtkspell2 backend on darwin, or it's better to disable spellcheck on darwin?

@7c6f434c
Copy link
Member

7c6f434c commented Nov 2, 2019

Observation: gtkspell2 depends on enchant which has failed on Darwin for exactly a year (OK, a year without a few hours). It has been marked as unsupported on x86_64-darwin. I think as gtkspell2 is an added feature and we used Inkscape fine without it, adding the feature only on Linux platforms first should be fine (and will unbreak ofBorg eval).

@urkud
Copy link
Contributor Author

urkud commented Nov 2, 2019

@7c6f434c Done.

@7c6f434c
Copy link
Member

7c6f434c commented Nov 2, 2019

@GrahamcOfBorg eval

@urkud
inkscape: use latest poppler, use gtkspell2, drop -fpermissive
ba0a68c 
It seems that `inkscape-0.9.4` builds with the latest poppler and
without the `-fpermissive` workaround.
@urkud
Copy link
Contributor Author

urkud commented Nov 2, 2019

@7c6f434c Fixed another typo.

7c6f434c
7c6f434c reviewed Nov 3, 2019
View reviewed changes
pkgs/applications/graphics/inkscape/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
librsvg # for loading icons

python2Env perlPackages.perl
];
] ++ stdenv.lib.optional (!stdenv.isDarwin) gtkspell2;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking at ofBorg complaints, I think this check doesn't work as expected (and stdenv.isLinux is probably a better condition)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I guess isDarwin is good enough.

@7c6f434c 7c6f434c merged commit 07da1ca into NixOS:master Nov 3, 2019
@veprbl veprbl mentioned this pull request Nov 6, 2019
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@7c6f434c 7c6f434c 7c6f434c left review comments

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@urkud @7c6f434c