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

libqtxdg: fix pkgconfig files #38410

Merged
merged 1 commit into from Apr 4, 2018
Merged

libqtxdg: fix pkgconfig files #38410

merged 1 commit into from Apr 4, 2018

Conversation

pbogdan
Copy link
Member

@pbogdan pbogdan commented Apr 3, 2018

Motivation for this change

Tried to build an out of tree package that depends on libqtxdg and it couldn't find the library using pkgconfig because of some incorrect paths in the pkgconfig files, see the commit message for details.
I admit I'm not quite sure if this is correct way to fix this but worked for my specific use case and doesn't seem to affect compilation of in-tree packages that depend on this library.

/cc @romildo

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.

@pbogdan
libqtxdg: fix pkgconfig files
a1fec88 
Without this change pkgconfig files contain incorrect values for libdir and
includedir in the form of:

prefix: /nix/store/...liblibqtxdg
libdir: ${prefix}//nix/store/.../libqtxdg/lib
includedir: ${prefix}//nix/store/.../libqtxdg/include
@pbogdan
Copy link
Member Author

pbogdan commented Apr 3, 2018

@GrahamcOfBorg build lxqt

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: lxqt

Partial log (click to expand)

/nix/store/ysjwrr1apvi9hkc61jdnpsypn67cmsm5-lxqt-themes-0.12.0
/nix/store/0fdppmpls8kc834ha47mj4cllaqw0kzp-obconf-qt-0.12.0
/nix/store/ab41mnn5q9i91pbrivpd9mnplswkbhjc-pavucontrol-qt-0.3.0
/nix/store/ppd60cc4kl8qzipjlrrhziy3y657lfgr-pcmanfm-qt-0.12.0
/nix/store/niyb5pbdqm3ni3gldz9qqjf5v9k03kby-qlipper-5.1.1
/nix/store/v7yz1s8rpagd4947d9gsmjc2myzhfpaw-qps-1.10.17
/nix/store/x0d47h6iyfvr6v89vr3rmhr11h1cfjx7-qterminal-0.8.0
/nix/store/c83vf28lh3cm935if165vwlydk96x7b7-qtermwidget-0.8.0
/nix/store/ky21livddm55ggrfzlq82n912r6mmycl-qtermwidget_0_7_1-0.7.1
/nix/store/d65mfxsr5p4ly4anzlglwzjqjdxqivlr-screengrab-1.97

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: lxqt

Partial log (click to expand)

/nix/store/ksk5vgl2ldxq984128xk803ggrlym1kh-lxqt-themes-0.12.0
/nix/store/xn3s6nhzy5p6jinly8xh5k2jxf75mxfp-obconf-qt-0.12.0
/nix/store/gn5kaz1syjlq7msvb494n0wi3ywapi2h-pavucontrol-qt-0.3.0
/nix/store/x75llz1j708qpr6b2hnzl1bkwkglzhrp-pcmanfm-qt-0.12.0
/nix/store/rcyvkf7sjsv8yrjmsnsa7fj40vnaqsdg-qlipper-5.1.1
/nix/store/sj1na7va2v59485m1cg4k70gzgikaxgq-qps-1.10.17
/nix/store/00vm58qh59bmvn922b9khic764d84rfv-qterminal-0.8.0
/nix/store/hd0wrcrm8hncf0aqb69chzjpi9hij0dz-qtermwidget-0.8.0
/nix/store/wlrackb80fvdfq7alm4xfs4cahgdv56g-qtermwidget_0_7_1-0.7.1
/nix/store/zbrwhxrpympqb2f2qigsx5wwvfzxla6j-screengrab-1.97

@Mic92 Mic92 merged commit d0b98f7 into NixOS:master Apr 4, 2018
@Mic92
Copy link
Member

Mic92 commented Apr 4, 2018

Looks good to me.

@Mic92
Copy link
Member

Mic92 commented Apr 4, 2018

git backport a1fec88
[detached HEAD 590320e] libqtxdg: fix pkgconfig files
Author: Piotr Bogdan ppbogdan@gmail.com
Date: Tue Apr 3 21:54:38 2018 +0100
1 file changed, 5 insertions(+), 1 deletion(-)

@pbogdan pbogdan deleted the libqtxdg-pkgconfig branch December 3, 2019 17:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@pbogdan @GrahamcOfBorg @Mic92