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

qpdfview: hardcode qmake files #71887

Merged
merged 1 commit into from Oct 25, 2019
Merged

qpdfview: hardcode qmake files #71887

merged 1 commit into from Oct 25, 2019

Conversation

rardiol
Copy link
Contributor

@rardiol rardiol commented Oct 24, 2019

Motivation for this change

Fixes compile failure https://nix-cache.s3.amazonaws.com/log/8rhpv2id6l2c1as2n3q15kfzm27l3m0v-qpdfview-0.4.18.drv .
Unfortunately I can't figure out why the commented solution bizarrely doesn't work, which would be better than hard coding the *.pro files. Any guesses?

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 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

@ofborg ofborg bot requested a review from 7c6f434c October 24, 2019 03:17
@7c6f434c
Copy link
Member

Maybe qmakeFlags is an array at the preConfigure time? I haven't looked at the details, but this is my first association.

@rardiol
Copy link
Contributor Author

rardiol commented Oct 24, 2019

Yeah, I needed to append as an array and not a blob of text. Thanks.

Lassulus
Lassulus approved these changes Oct 25, 2019
View reviewed changes
Copy link
Member

@Lassulus Lassulus left a comment

Choose a reason for hiding this comment

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

tested with nix-review, opened a pdf file

@Lassulus Lassulus merged commit b4f257c into NixOS:master Oct 25, 2019
@c0bw3b
Copy link
Contributor

c0bw3b commented Oct 25, 2019

Actually you just needed to escape it to safely pass it to qmake via env shell
Done in 7bb372b

@rardiol
Copy link
Contributor Author

rardiol commented Oct 25, 2019

just tried commit 7bb372b, didn't work. I tried escaping the * already, I guess it's evaluated somewhere before it should in another directory and lost.

@c0bw3b
Copy link
Contributor

c0bw3b commented Oct 26, 2019

Weird, I did try locally and I could build it with the escape, but it does fail on Hydra... Reverted in 614cf5d anyway.

I was sure similar situation were solved with make flags array trickery (without a shell hook) but..

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Lassulus Lassulus Lassulus approved these changes

@7c6f434c 7c6f434c Awaiting requested review from 7c6f434c

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

Successfully merging this pull request may close these issues.

None yet
4 participants
@rardiol @7c6f434c @c0bw3b @Lassulus