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
sway: fix gtk wrapper #86960
sway: fix gtk wrapper #86960
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm a bit confused about the nativeBuildInputs
change, but apart from that the diff looks ok. I can run some tests tomorrow.
We need to backport this to 20.03 because |
@primeos You were perfectly right, the modification about |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The diff and result LGTM now :)
@worldofpeace are you ok with the current version as well?
And to keep a record of the current state:
Old wrapper:
#! /nix/store/kgp3vq8l9yb8mzghbw83kyr3f26yqvsz-bash-4.4-p23/bin/bash -e
export PATH='/nix/store/djkyx5ibn9fnsnh6kl39a37im0fah1dx-swaybg-1.0/bin'${PATH:+':'}$PATH
export GIO_EXTRA_MODULES='/nix/store/4fq6w7ksq1dba80sxpdgzrxpd46kdjgq-dconf-0.36.0-lib/lib/gio/modules'${GIO_EXTRA_MODULES:+':'}$GIO_EXTRA_MODULES
export GIO_EXTRA_MODULES='/nix/store/4fq6w7ksq1dba80sxpdgzrxpd46kdjgq-dconf-0.36.0-lib/lib/gio/modules'${GIO_EXTRA_MODULES:+':'}$GIO_EXTRA_MODULES
exec -a "$0" "/nix/store/ab7wxprzwk93zwcd2zpi5wf8y2il2gyl-sway-1.4/bin/.sway-wrapped" "$@"
Diff to the new wrapper:
-exec -a "$0" "/nix/store/ab7wxprzwk93zwcd2zpi5wf8y2il2gyl-sway-1.4/bin/.sway-wrapped" "$@"
+export GDK_PIXBUF_MODULE_FILE='/nix/store/d0r5r3zcjipx1qxqxmf1mqzwbay04vq3-librsvg-2.48.2/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache'
+export XDG_DATA_DIRS='/nix/store/6yrlycwcnxlgg6bkhq4jvwmahyrj00id-gtk+3-3.24.17/share/gsettings-schemas/gtk+3-3.24.17:/nix/store/78x2nyfhhili5ijd6l74z3flj63p92s0-gsettings-desktop-schemas-3.36.0/share/gsettings-schemas/gsettings-desktop-schemas-3.36.0'${XDG_DATA_DIRS:+':'}$XDG_DATA_DIRS
+export XDG_DATA_DIRS='/nix/store/sc216i8nxdw9c2j4jzspgza0xy09allw-sway-1.4/share'${XDG_DATA_DIRS:+':'}$XDG_DATA_DIRS
+exec -a "$0" "/nix/store/sc216i8nxdw9c2j4jzspgza0xy09allw-sway-1.4/bin/.sway-wrapped" "$@"
@elyhaka thanks :) |
@worldofpeace told that we should backport it to 20.03. I haven't done any backport yet, I just have to cherry pick this commit over the current |
@elyhaka right, I forgot about that, thanks :) |
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/some-lose-ends-for-sway-on-nixos-which-we-should-fix/17728/6 |
Motivation for this change
The GTK Sway wrapper is broken, to make it works I had to:
gtk3
andglib
in thebuildInputs
gappsWrapperArgsHook
manuallyThis should fix #67704
cc @primeos @ymarkus
Things done
sandbox
innix.conf
on non-NixOS linux)./result/bin/
)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
nix path-info -S
before and after)