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

qt59: darwin compatibility #31570

Closed
wants to merge 2 commits into from
Closed

qt59: darwin compatibility #31570

wants to merge 2 commits into from

Conversation

acowley
Copy link
Contributor

@acowley acowley commented Nov 12, 2017

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
  • Fits CONTRIBUTING.md.

@acowley
Copy link
Contributor Author

acowley commented Nov 12, 2017

Ping @j-hao : can you take a look at this? The sed patches are hacky, but are enough to convince the compiler.

@acowley
Copy link
Contributor Author

acowley commented Nov 13, 2017 •
edited

I've moved the -qt-harfbuzz flag into a darwin guarded section where it should have been. These fixes shouldn't affect linux.

@LnL7 LnL7 added 6.topic: darwin Running or building packages on Darwin and removed 10.rebuild-linux: 501+ labels Nov 13, 2017
LnL7
LnL7 approved these changes Nov 13, 2017
View reviewed changes
pkgs/development/libraries/qt-5/modules/qtbase.nix Outdated

# Recent Qt releases use SDK (and Objective-C) features beyond
# the 10.10 available in nixpkgs
sed 's/NSEnumerator<NSWindow\*>/NSEnumerator/' -i ./src/plugins/platforms/cocoa/qcocoawindow.mm
Copy link
Member

Choose a reason for hiding this comment

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

I prefer using substituteInPlace for literals so you don't have to worry about escaping stuff.

@LnL7
Copy link
Member

LnL7 commented Nov 13, 2017

@GrahamcOfBorg build qt59.qtbase

GrahamcOfBorg
GrahamcOfBorg reviewed Nov 13, 2017
View reviewed changes
Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Failure for system: x86_64-darwin

these derivations will be built:
  /nix/store/lf4lzy6kby0ai7aybnck5gbpvw8n3vjr-qtbase-5.9.1.drv
error: a 'x86_64-darwin' is required to build '/nix/store/lf4lzy6kby0ai7aybnck5gbpvw8n3vjr-qtbase-5.9.1.drv', but I am a 'x86_64-linux'

GrahamcOfBorg
GrahamcOfBorg approved these changes Nov 13, 2017
View reviewed changes
Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success for system: x86_64-linux


  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
 21 5858k   21 1251k    0     0  1251k      0  0:00:04 --:--:--  0:00:04 3525k
100 5858k  100 5858k    0     0  5858k      0  0:00:01  0:00:01 --:--:-- 5369k

fetching path ‘/nix/store/fabf1691l4cc85ic7b6d4bq88lxs5yxy-qtbase-5.9.1-bin’...

*** Downloading ‘https://cache.nixos.org/nar/0q2cfilfqpkc3yv9cm1gvyzqq9vlyzhykga4cyxlab5al1cv9smd.nar.xz’ (signed by ‘cache.nixos.org-1’) to ‘/nix/store/fabf1691l4cc85ic7b6d4bq88lxs5yxy-qtbase-5.9.1-bin’...
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed

  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
100  525k  100  525k    0     0   525k      0  0:00:01 --:--:--  0:00:01 1884k

/nix/store/fabf1691l4cc85ic7b6d4bq88lxs5yxy-qtbase-5.9.1-bin

@LnL7
Copy link
Member

LnL7 commented Nov 13, 2017

@grahamc hmm, evaluates fine on hydra.

@LnL7
Copy link
Member

LnL7 commented Nov 13, 2017

@GrahamcOfBorg build qt59.qtbase

GrahamcOfBorg
GrahamcOfBorg reviewed Nov 13, 2017
View reviewed changes
Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Failure for system: x86_64-darwin

these derivations will be built:
  /nix/store/lf4lzy6kby0ai7aybnck5gbpvw8n3vjr-qtbase-5.9.1.drv
error: a 'x86_64-darwin' is required to build '/nix/store/lf4lzy6kby0ai7aybnck5gbpvw8n3vjr-qtbase-5.9.1.drv', but I am a 'x86_64-linux'

GrahamcOfBorg
GrahamcOfBorg reviewed Nov 13, 2017
View reviewed changes
Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Failure for system: x86_64-linux

could not download ‘/nix/store/wg9hblgn2swhg79qn9qa3xq0v735y9d4-xkeyboard-config-2.22’ from any binary cache
fetching path ‘/nix/store/j4rjrn15yrcybw1yj4iqmqym7srl9cw0-dns-root-data-2017-10-24’ failed with exit code 1
fetching path ‘/nix/store/wg9hblgn2swhg79qn9qa3xq0v735y9d4-xkeyboard-config-2.22’ failed with exit code 1
error: creating directory ‘/nix/store/mjx71lmnlf4psm9942djjcd8b56hyk8b-glibc-2.26-75’: No space left on device

  0 5521k    0 48800    0     0  48800      0  0:01:55 --:--:--  0:01:55  189k
curl: (23) Failed writing body (334 != 16366)
download of ‘https://cache.nixos.org/nar/1lci8777y3gy9pm2ydhzpadjra48l04sr8r9i7azx2d1vpi8gyxk.nar.xz’ failed: No such file or directory
could not download ‘/nix/store/mjx71lmnlf4psm9942djjcd8b56hyk8b-glibc-2.26-75’ from any binary cache
fetching path ‘/nix/store/mjx71lmnlf4psm9942djjcd8b56hyk8b-glibc-2.26-75’ failed with exit code 1
error: build of ‘/nix/store/smsqqpsmk6jfc5d1iyzklb9r2av1hyz6-qtbase-5.9.1.drv’ failed

@acowley
Copy link
Contributor Author

acowley commented Nov 13, 2017

Okay, I tend to have more trouble with substituteInPlace than sed and it seems like another way of doing the same thing, but if someone can rewrite those sed replacements, I'm happy to change them out. I tried copying the template suggested by the earlier substituteInPlace calls, but they ended up erasing the contents of the files.

@acowley
Copy link
Contributor Author

acowley commented Nov 13, 2017

I've swapped out the uses of sed for substituteInPlace. It fails for me in nix-shell, but the nix-build worked. This is apparently due to something wrong on my systems.

@acowley
Copy link
Contributor Author

acowley commented Nov 14, 2017

It looks like @ttuegel fixed the qt issues independently. @LnL would you like to separate your gstreamer fix, and I'll just close this PR?

@acowley acowley closed this Nov 15, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GrahamcOfBorg GrahamcOfBorg GrahamcOfBorg approved these changes

@LnL7 LnL7 LnL7 approved these changes

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 0 10.rebuild-darwin: 101-500 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@acowley @LnL7 @GrahamcOfBorg