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.

Sign up for GitHub

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

recoll: Add support to build without QT #42876

Merged
merged 1 commit into from Jul 5, 2018
Merged

recoll: Add support to build without QT #42876

merged 1 commit into from Jul 5, 2018

Conversation

marsam
Copy link
Contributor

@marsam marsam commented Jul 2, 2018

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

infinisil
infinisil reviewed Jul 3, 2018
View reviewed changes
pkgs/top-level/all-packages.nix Outdated
@@ -4778,7 +4778,7 @@ with pkgs;

recutils = callPackage ../tools/misc/recutils { };

recoll = callPackage ../applications/search/recoll { };
recoll = callPackage ../applications/search/recoll { withGui = true; };
Copy link
Member

Choose a reason for hiding this comment

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

Why not just use withGui ? true in the arguments?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

no special reason, reading other examples in all-packages.nix gave me the impression it was the preferred way. I can change is you prefer it

Copy link
Member

Choose a reason for hiding this comment

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

Yeah I'd prefer that, otherwise the default value in the package definition doesn't even have any use and can only confuse.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Updated :)

@marsam marsam force-pushed the feature/build-recoll-without-qt branch from 6b3dea4 to e7cde47 Compare July 5, 2018 02:27
@marsam marsam force-pushed the feature/build-recoll-without-qt branch from e7cde47 to 79b81c3 Compare July 5, 2018 11:17
@adisbladis
Copy link
Member

@GrahamcOfBorg build recoll

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: recoll

Partial log (click to expand)

/nix/store/8kb5yrmmhjga9m4gy42akk6im0lrnlf4-recoll-1.23.7/share/recoll/filters/rclsiduxman: interpreter directive changed from "/bin/sh" to "/nix/store/8zkg9ac4s4alzyf4a8kfrig1j73z66dw-bash-4.4-p23/bin/sh"
/nix/store/8kb5yrmmhjga9m4gy42akk6im0lrnlf4-recoll-1.23.7/share/recoll/filters/rclscribus: interpreter directive changed from "/bin/sh" to "/nix/store/8zkg9ac4s4alzyf4a8kfrig1j73z66dw-bash-4.4-p23/bin/sh"
/nix/store/8kb5yrmmhjga9m4gy42akk6im0lrnlf4-recoll-1.23.7/share/recoll/filters/rclaudio: interpreter directive changed from "/usr/bin/env python2" to "/nix/store/d3aa78jf7pm9lk6ad67x4f21a068dxn6-python-2.7.15/bin/python2"
/nix/store/8kb5yrmmhjga9m4gy42akk6im0lrnlf4-recoll-1.23.7/share/recoll/filters/rclinfo: interpreter directive changed from "/usr/bin/env python2" to "/nix/store/d3aa78jf7pm9lk6ad67x4f21a068dxn6-python-2.7.15/bin/python2"
/nix/store/8kb5yrmmhjga9m4gy42akk6im0lrnlf4-recoll-1.23.7/share/recoll/filters/rclzip: interpreter directive changed from "/usr/bin/env python2" to "/nix/store/d3aa78jf7pm9lk6ad67x4f21a068dxn6-python-2.7.15/bin/python2"
/nix/store/8kb5yrmmhjga9m4gy42akk6im0lrnlf4-recoll-1.23.7/share/recoll/filters/rcldia: interpreter directive changed from "/usr/bin/env python2" to "/nix/store/d3aa78jf7pm9lk6ad67x4f21a068dxn6-python-2.7.15/bin/python2"
/nix/store/8kb5yrmmhjga9m4gy42akk6im0lrnlf4-recoll-1.23.7/share/recoll/filters/rclimg.py: interpreter directive changed from "/usr/bin/env python2" to "/nix/store/d3aa78jf7pm9lk6ad67x4f21a068dxn6-python-2.7.15/bin/python2"
/nix/store/8kb5yrmmhjga9m4gy42akk6im0lrnlf4-recoll-1.23.7/share/recoll/filters/rclpdf.py: interpreter directive changed from "/usr/bin/env python2" to "/nix/store/d3aa78jf7pm9lk6ad67x4f21a068dxn6-python-2.7.15/bin/python2"
checking for references to /build in /nix/store/8kb5yrmmhjga9m4gy42akk6im0lrnlf4-recoll-1.23.7...
/nix/store/8kb5yrmmhjga9m4gy42akk6im0lrnlf4-recoll-1.23.7

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: recoll

Partial log (click to expand)

/nix/store/clz2gmmz5q1pnysbxdbyc8452hhi0ija-recoll-1.23.7/share/recoll/filters/rcldia: interpreter directive changed from "/usr/bin/env python2" to "/nix/store/fh8z4sniyv18b4jf32f3gnn862bvwc3f-python-2.7.15/bin/python2"
/nix/store/clz2gmmz5q1pnysbxdbyc8452hhi0ija-recoll-1.23.7/share/recoll/filters/rclchm: interpreter directive changed from "/usr/bin/env python2" to "/nix/store/fh8z4sniyv18b4jf32f3gnn862bvwc3f-python-2.7.15/bin/python2"
/nix/store/clz2gmmz5q1pnysbxdbyc8452hhi0ija-recoll-1.23.7/share/recoll/filters/rclcheckneedretry.sh: interpreter directive changed from "/bin/sh" to "/nix/store/p0vy17dp9jk2mvqsxsqnb14s3797lay7-bash-4.4-p23/bin/sh"
/nix/store/clz2gmmz5q1pnysbxdbyc8452hhi0ija-recoll-1.23.7/share/recoll/filters/rclaudio: interpreter directive changed from "/usr/bin/env python2" to "/nix/store/fh8z4sniyv18b4jf32f3gnn862bvwc3f-python-2.7.15/bin/python2"
/nix/store/clz2gmmz5q1pnysbxdbyc8452hhi0ija-recoll-1.23.7/share/recoll/filters/rclaptosidman: interpreter directive changed from "/bin/sh" to "/nix/store/p0vy17dp9jk2mvqsxsqnb14s3797lay7-bash-4.4-p23/bin/sh"
/nix/store/clz2gmmz5q1pnysbxdbyc8452hhi0ija-recoll-1.23.7/share/recoll/filters/rclabw: interpreter directive changed from "/bin/sh" to "/nix/store/p0vy17dp9jk2mvqsxsqnb14s3797lay7-bash-4.4-p23/bin/sh"
/nix/store/clz2gmmz5q1pnysbxdbyc8452hhi0ija-recoll-1.23.7/share/recoll/filters/rcl7z: interpreter directive changed from "/usr/bin/env python2" to "/nix/store/fh8z4sniyv18b4jf32f3gnn862bvwc3f-python-2.7.15/bin/python2"
/nix/store/clz2gmmz5q1pnysbxdbyc8452hhi0ija-recoll-1.23.7/share/recoll/filters/hotrecoll.py: interpreter directive changed from "/usr/bin/python" to "/nix/store/fh8z4sniyv18b4jf32f3gnn862bvwc3f-python-2.7.15/bin/python"
checking for references to /build in /nix/store/clz2gmmz5q1pnysbxdbyc8452hhi0ija-recoll-1.23.7...
/nix/store/clz2gmmz5q1pnysbxdbyc8452hhi0ija-recoll-1.23.7

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: recoll

Partial log (click to expand)

make[2]: Leaving directory '/private/tmp/nix-build-libwpd-0.10.0.drv-0/libwpd-0.10.0'
make[1]: Leaving directory '/private/tmp/nix-build-libwpd-0.10.0.drv-0/libwpd-0.10.0'
glibPreFixupPhase
glibPreFixupPhase
post-installation fixup
strip is /nix/store/7ddbq63v97nk8gkbf7gcsfmby37h6gbl-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/jjhdwr2jzxswychsyzmg8lgmv6vyr4xv-libwpd-0.10.0/lib  /nix/store/jjhdwr2jzxswychsyzmg8lgmv6vyr4xv-libwpd-0.10.0/bin
patching script interpreter paths in /nix/store/jjhdwr2jzxswychsyzmg8lgmv6vyr4xv-libwpd-0.10.0
cannot build derivation '/nix/store/asjz1klmc5h9clj2acpi47zw5zbv8jm1-recoll-1.23.7.drv': 1 dependencies couldn't be built
�[31;1merror:�[0m build of '/nix/store/asjz1klmc5h9clj2acpi47zw5zbv8jm1-recoll-1.23.7.drv' failed

@adisbladis adisbladis merged commit 58ff8a3 into NixOS:master Jul 5, 2018
@adisbladis
Copy link
Member

Thanks

@marsam marsam deleted the feature/build-recoll-without-qt branch July 5, 2018 18:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@infinisil infinisil infinisil left review comments

@pSub pSub pSub approved these changes

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

Successfully merging this pull request may close these issues.

None yet
5 participants
@marsam @adisbladis @GrahamcOfBorg @pSub @infinisil