Navigation Menu

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

xdg-desktop-portal{,-gtk}: 1.1.0 -> 1.2.0 #54299

Merged
merged 3 commits into from Feb 25, 2019
Merged

xdg-desktop-portal{,-gtk}: 1.1.0 -> 1.2.0 #54299

merged 3 commits into from Feb 25, 2019

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Jan 19, 2019

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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@jtojnar
Copy link
Contributor

jtojnar commented Jan 19, 2019

No package 'gdk-pixbuf-2.0' found

@jtojnar
Copy link
Contributor

jtojnar commented Jan 19, 2019

Looking at flatpak/xdg-desktop-portal@c2bc33b, we might also need librsvg.

@dtzWill
Copy link
Member Author

dtzWill commented Jan 19, 2019

Oh, sorry I missed those commits since they weren't adjacent 😇. It should at least build, and seems to work for me once so....

Okay here: dtzWill@cb783b3 (I'll pick when next back on my machine), not sure about librsvg.

@jtojnar
Copy link
Contributor

jtojnar commented Jan 19, 2019

I guess librsvg is added by wrapGAppsHook but it will probably be better to list it explicitly with a comment that it is needed for icon validator to support SVG.

Though it looks like they switched to validator from flatpak today.

@jtojnar
Copy link
Contributor

jtojnar commented Jan 19, 2019

The path will need to be patched: https://github.com/flatpak/xdg-desktop-portal/pull/290/files#diff-4a78fe4a1e47fe57fc0581a862ffabd2R408

@jtojnar
Copy link
Contributor

jtojnar commented Jan 19, 2019

Bah it is messy flatpak/xdg-desktop-portal#289 maybe we should wait to see how it plays out.

@dtzWill dtzWill changed the title xdg-desktop-portal{,-gtk}: 1.1.0 -> 1.1.1 xdg-desktop-portal{,-gtk}: 1.1.0 -> 1.2.0 Jan 27, 2019
@dtzWill
Copy link
Member Author

dtzWill commented Jan 27, 2019

@GrahamcOfBorg build xdg-desktop-portal xdg-desktop-portal-gtk

@jtojnar
Copy link
Contributor

jtojnar commented Jan 27, 2019 •
edited

gdk_pixbuf should not be needed now by xdg-desktop-portal, since the validator is part of flatpak. Instead, we need to hard code the path to @flatpak@/libexec https://github.com/flatpak/xdg-desktop-portal/blob/f8e4054997a077bb7ab6bebe3dfc65145ec6941f/src/notification.c#L404

@dtzWill dtzWill force-pushed the update/xdg-desktop-portal-1.1.1 branch from 0684a35 to f1e86ab Compare January 27, 2019 22:03
@dtzWill
Copy link
Member Author

dtzWill commented Jan 29, 2019

flatpak 1.2.0-- should I submit separately or update with these? https://github.com/dtzWill/nixpkgs/tree/update/flatpak-1.2.0 FWIW :).

@jtojnar
Copy link
Contributor

jtojnar commented Jan 29, 2019

I’d update with these since they are mutually dependent.

@worldofpeace worldofpeace mentioned this pull request Feb 7, 2019
Closed
@worldofpeace
Copy link
Contributor

flatpak 1.2.0-- should I submit separately or update with these? https://github.com/dtzWill/nixpkgs/tree/update/flatpak-1.2.0 FWIW :).
I’d update with these since they are mutually dependent.

Got the latest flatpak update in here.

@jtojnar Any comments to get things moving again?

@jtojnar
Copy link
Contributor

jtojnar commented Feb 17, 2019

gdk_pixbuf should not be needed now by xdg-desktop-portal, since the validator is part of flatpak. Instead, we need to hard code the path to @flatpak@/libexec https://github.com/flatpak/xdg-desktop-portal/blob/f8e4054997a077bb7ab6bebe3dfc65145ec6941f/src/notification.c#L404

Was this addressed yet?

@worldofpeace
Copy link
Contributor

gdk_pixbuf should not be needed now by xdg-desktop-portal, since the validator is part of flatpak. Instead, we need to hard code the path to @flatpak@/libexec https://github.com/flatpak/xdg-desktop-portal/blob/f8e4054997a077bb7ab6bebe3dfc65145ec6941f/src/notification.c#L404

Was this addressed yet?

Don't think so, I'll add a patch for xdg-desktop-portal.

@GrahamcOfBorg build nixosTests.flatpak

@jtojnar
Copy link
Contributor

jtojnar commented Feb 21, 2019

Thanks, that looks good.

@worldofpeace
Copy link
Contributor

Running tests locally since they seem to time out here.

@hedning
Copy link
Contributor

hedning commented Feb 25, 2019

Anything missing here? We probably want this in 19.03 right.

@worldofpeace
Copy link
Contributor

@hedning I don't think so, I ran the tests locally and it seemed fine.

I'd say let's go for 👍

@hedning hedning merged commit 3a83ec2 into NixOS:master Feb 25, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jtojnar jtojnar Awaiting requested review from jtojnar

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
5 participants
@dtzWill @jtojnar @worldofpeace @hedning @GrahamcOfBorg