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

numix-icon-theme-circle: Fix dangling symlinks #73549

Merged
merged 2 commits into from Nov 19, 2019

Conversation

@Flakebi
Copy link
Member

Flakebi commented Nov 17, 2019

Motivation for this change

The panel folders in icon themes, e.g. share/icons/Numix-Circle-Light/16/panel are symlinks to the base theme. E.g. to ../../Numix-Light/16/panel.
The path it should resolve to is /run/current-system/sw/share/icons/Numix-Light/16/panel. However, as the real path is /nix/store/41sz1f24wbfi0xjx5wpzdhb2b6yp3rlb-numix-icon-theme-circle-19.09.20/share/icons/Numix-Circle-Light/16/panel, it resolves to /nix/store/41sz1f24wbfi0xjx5wpzdhb2b6yp3rlb-numix-icon-theme-circle-19.09.20/share/icons/Numix-Light/16/panel instead.
The right path would be /nix/store/4fjgbp26h1xsqjf54jfhlyi9vir80571-numix-icon-theme-19.09.20/share/icons/Numix-Light/16/panel from the numix-icon-theme package, not numix-icon-theme-circle.

Things done

Patch symlink paths to point to the absolute path of the numix-icon-theme package.
The link will be set to realpath ${numix-icon-theme}/share/icons/Numix/16/../../Numix-Light/16/panel.

  • 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 @romildo

Copy link
Contributor

romildo left a comment

Looks good to me.

The same fix should be applied to numix-icon-theme-square too.

@Flakebi

This comment has been minimized.

Copy link
Member Author

Flakebi commented Nov 19, 2019

Thanks for looking at this @romildo.
I applied the same fix to numix-icon-theme-square and checked the the symlinks work.

@ofborg ofborg bot requested a review from romildo Nov 19, 2019
@romildo romildo merged commit 62d0993 into NixOS:master Nov 19, 2019
15 checks passed
15 checks passed
Evaluation Performance Report Evaluator Performance Report
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
numix-icon-theme-circle, numix-icon-theme-square on aarch64-linux Success
Details
numix-icon-theme-circle, numix-icon-theme-square on x86_64-linux Success
Details
@romildo

This comment has been minimized.

Copy link
Contributor

romildo commented Nov 19, 2019

Thanks.

@Flakebi Flakebi deleted the Flakebi:numix-icon-theme branch Nov 19, 2019
dtzWill added a commit to dtzWill/nixpkgs that referenced this pull request Nov 19, 2019
numix-icon-theme-circle: Fix dangling symlinks
(cherry picked from commit 62d0993)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.