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

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

Merged
merged 3 commits into from Feb 25, 2019

Conversation

@dtzWill
Copy link
Contributor

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

This comment has been minimized.

Copy link
Contributor

jtojnar commented Jan 19, 2019

No package 'gdk-pixbuf-2.0' found

@jtojnar

This comment has been minimized.

Copy link
Contributor

jtojnar commented Jan 19, 2019

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

@dtzWill

This comment has been minimized.

Copy link
Contributor 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

This comment has been minimized.

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

This comment has been minimized.

Copy link
Contributor

jtojnar commented Jan 19, 2019

@jtojnar

This comment has been minimized.

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

This comment has been minimized.

Copy link
Contributor Author

dtzWill commented Jan 27, 2019

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

@jtojnar

This comment has been minimized.

Copy link
Contributor

jtojnar commented Jan 27, 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

@dtzWill dtzWill force-pushed the dtzWill:update/xdg-desktop-portal-1.1.1 branch from 0684a35 to f1e86ab Jan 27, 2019
@dtzWill

This comment has been minimized.

Copy link
Contributor 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

This comment has been minimized.

Copy link
Contributor

jtojnar commented Jan 29, 2019

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

@worldofpeace worldofpeace force-pushed the dtzWill:update/xdg-desktop-portal-1.1.1 branch from f1e86ab to a583786 Feb 17, 2019
@worldofpeace

This comment has been minimized.

Copy link
Member

worldofpeace commented Feb 17, 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 :).
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

This comment has been minimized.

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

This comment has been minimized.

Copy link
Member

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

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

@GrahamcOfBorg build nixosTests.flatpak

@jtojnar

This comment has been minimized.

Copy link
Contributor

jtojnar commented Feb 21, 2019

Thanks, that looks good.

@worldofpeace

This comment has been minimized.

Copy link
Member

worldofpeace commented Feb 21, 2019

Running tests locally since they seem to time out here.

@hedning

This comment has been minimized.

Copy link
Contributor

hedning commented Feb 25, 2019

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

@worldofpeace

This comment has been minimized.

Copy link
Member

worldofpeace commented Feb 25, 2019

@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
13 checks passed
13 checks passed
flatpak, xdg-desktop-portal on x86_64-darwin No attempt
Details
flatpak, xdg-desktop-portal on aarch64-linux Success
Details
flatpak, xdg-desktop-portal on x86_64-linux Success
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.