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

rofi: wrap gdk-pixbuf, fixes svg icons #110805

Merged
merged 1 commit into from Feb 21, 2021
Merged

rofi: wrap gdk-pixbuf, fixes svg icons #110805

merged 1 commit into from Feb 21, 2021
+10 −3

Conversation

kanashimia
Copy link
Member

Motivation for this change

Rofi uses GdkPixbuf for Icon parsing since 1.6.1
similar closed PR: #107156
that one tried to wrap unwrapped version

rofi-theme-selector just uses ROFI=$(which rofi) so no need to wrap it
not sure about moving wrapper scripts out from buildInputs to native ones
and idk why is GIO_EXTRA_MODULES there two times
i think rofi should need only GDK_PIXBUF_MODULE_FILE to be set

Old wrapper
›cat (which rofi)
#! /nix/store/dskh7v2h3ly3kdkfk3xmjlqql1zr0hnw-bash-4.4-p23/bin/bash -e
export XDG_DATA_DIRS='/nix/store/m8ylpfsw2208xkjzcw29r93q5x5v3pdv-hicolor-icon-theme-0.17/share'${XDG_DATA_DIRS:+':'}$XDG_DATA_DIRS
exec "/nix/store/gfjnldfkxinzmy2av6lym02s2qkk5kp0-rofi-unwrapped-1.6.1/bin/rofi"  "$@"
New wrapper
›cat (which rofi)
#! /nix/store/dskh7v2h3ly3kdkfk3xmjlqql1zr0hnw-bash-4.4-p23/bin/bash -e
export GIO_EXTRA_MODULES='/nix/store/ff82al5hzs9lpdzgk8cjjzpxy6qhxx9h-dconf-0.38.0-lib/lib/gio/modules'${GIO_EXTRA_MODULES:+':'}$GIO_EXTRA_MODULES
export GIO_EXTRA_MODULES='/nix/store/ff82al5hzs9lpdzgk8cjjzpxy6qhxx9h-dconf-0.38.0-lib/lib/gio/modules'${GIO_EXTRA_MODULES:+':'}$GIO_EXTRA_MODULES
export GDK_PIXBUF_MODULE_FILE='/nix/store/azyzm1pc4w1vdg5mwiqazvg16fa5m6gg-librsvg-2.50.1/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache'
export XDG_DATA_DIRS='/nix/store/3a81krh4hb5kkl51kfvsprvjr9y393rl-gtk+3-3.24.24/share/gsettings-schemas/gtk+3-3.24.24'${XDG_DATA_DIRS:+':'}$XDG_DATA_DIRS
export XDG_DATA_DIRS='/nix/store/fii55p8cngqa64jcwhsiqr0vzj7b7crb-rofi-1.6.1/share'${XDG_DATA_DIRS:+':'}$XDG_DATA_DIRS
export XDG_DATA_DIRS='/nix/store/m8ylpfsw2208xkjzcw29r93q5x5v3pdv-hicolor-icon-theme-0.17/share'${XDG_DATA_DIRS:+':'}$XDG_DATA_DIRS
exec "/nix/store/gfjnldfkxinzmy2av6lym02s2qkk5kp0-rofi-unwrapped-1.6.1/bin/rofi"  "$@"
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.

@SuperSandro2000
Copy link
Member

This is a semi-automatic executed nixpkgs-review which is checked by a human on a best effort basis and does not build all packages (e.g. lumo, tensorflow or pytorch).
If you have any questions or problems please reach out to SuperSandro2000 on IRC.

Result of nixpkgs-review pr 110805 run on x86_64-linux 1

7 packages built:
  • i3-layout-manager
  • rofi
  • rofi-file-browser
  • rofi-menugen
  • rofi-pass
  • rofi-systemd
  • rofimoji

The following issues got detected with the above build packages.
Please fix at least the ones listed with your changed packages:

rofimoji:

Zero tests run by pytest got detected: 'Ran 0 tests in 0.000s'
You have the following options to fix this:

  • Tell pytest(CheckHook) where to find the tests included in the package
  • Check if the GitHub Repo contains tests but they are not shipped with Pypi. If so please switch to fetchFromGitHub.
  • If the Packages does not contain any tests add 'doCheck = false;' and a pythonImportsCheck.

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/458

@Algram
Copy link
Member

Algram commented Feb 19, 2021

image

This fixed it for me. Thank you very much!

@SuperSandro2000
Copy link
Member

@ofborg eval

@SuperSandro2000 SuperSandro2000 merged commit b50889f into NixOS:master Feb 21, 2021
@Omoroca13 Omoroca13 mentioned this pull request Jun 10, 2021
Open
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: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@kanashimia @SuperSandro2000 @nixos-discourse @Algram