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

[20.03] sway: fix gtk wrapper #88018

Merged
merged 1 commit into from May 17, 2020
Merged

Conversation

@Elyhaka
Copy link
Contributor

Elyhaka commented May 17, 2020

(cherry picked from commit cdfad5a)

Motivation for this change

Backport of #86960 for 20.03

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
@primeos
Copy link
Member

primeos commented May 17, 2020

@Elyhaka you somehow cherry-picked another commit that is not in Nixpkgs (edit: I just remembered that I used squash and merge). The original commit should be in the master branch of NixOS/nixpkgs, i.e. cdfad5a in this case (sorry for having to point out this minor detail, but let's do this properly). If you want I could also take care of the backport.

@Elyhaka
Copy link
Contributor Author

Elyhaka commented May 17, 2020

@primeos: That was the commit I had on my local branch, not sure why it changed it hash ? And when I compared it to the original PR and it seemed to be the same. You can handle it if you prefer.

edit: just saw your edit, ok, got how I got there.

@Ma27 Ma27 changed the title sway: fix gtk wrapper [20.03] sway: fix gtk wrapper May 17, 2020
@Elyhaka Elyhaka force-pushed the Elyhaka:fix-sway-wrapper-20.03 branch from 0e6dc8d to df8e736 May 17, 2020
Fixes #67704.

(cherry picked from commit cdfad5a)
@Elyhaka Elyhaka force-pushed the Elyhaka:fix-sway-wrapper-20.03 branch from df8e736 to 83cffb9 May 17, 2020
@primeos
Copy link
Member

primeos commented May 17, 2020

@Elyhaka thanks :)

@primeos primeos merged commit 2eb0da8 into NixOS:release-20.03 May 17, 2020
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

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