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

glava: fix glava wants to load shaders from /etc/xdg/glava #74052

Merged
merged 1 commit into from Nov 25, 2019

Conversation

@Ninlives
Copy link
Contributor

Ninlives commented Nov 24, 2019

Motivation for this change

fix absolute paths so glava can find default shader files correctly.

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 nix-review --run "nix-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.
Notify maintainers

cc @eadwu

@Ninlives
Copy link
Contributor Author

Ninlives commented Nov 24, 2019

@GrahamcOfBorg build glava

@Ninlives Ninlives changed the title fix glava wants to load shaders from /etc/xdg/glava glava: fix glava wants to load shaders from /etc/xdg/glava Nov 24, 2019
@ofborg ofborg bot requested a review from eadwu Nov 24, 2019
@eadwu
eadwu approved these changes Nov 24, 2019
Copy link
Member

eadwu left a comment

Works fine on my end, if ~/.config/glava doesn't exist then it defaults to the derivation's shaders but still works normally if ~/.config/glava exists.

@worldofpeace
Copy link
Member

worldofpeace commented Nov 24, 2019

Thinking if maybe you switch to meson you can use the flag

Though what's really confusing is why this doesn't use

only for linux. Then you can add $out/etc/xdg to XDG_CONFIG_DIRS with a wrapper.

@worldofpeace
Copy link
Member

worldofpeace commented Nov 24, 2019

Opened an issue at jarcode-foss/glava#140. This issue frequently comes up for NixOS.

@Ninlives
Copy link
Contributor Author

Ninlives commented Nov 25, 2019

Current version in nixpkgs is not up to date and does not use meson to build. The author has not released a new version since last year, I will check if the latest master branch works fine once I get some free time.

@worldofpeace
Copy link
Member

worldofpeace commented Nov 25, 2019

Current version in nixpkgs is not up to date and does not use meson to build. The author has not released a new version since last year, I will check if the latest master branch works fine once I get some feee time.

Oh, I wasn't aware there wasn't a release with the meson.build files.
In that case this fix is also acceptable, I was assuming the version in nixpkgs already had the meson.build files as they seem to have both build systems.

@worldofpeace worldofpeace merged commit f718f55 into NixOS:master Nov 25, 2019
15 checks passed
15 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
glava on aarch64-linux Success
Details
glava 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-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
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
@worldofpeace
Copy link
Member

worldofpeace commented Dec 1, 2019

Seems upstream will fix this jarcode-foss/glava#140 (comment).

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

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