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

Jump to bottom

nixnote2: fix window icon and themes #50404

Merged
merged 1 commit into from Nov 16, 2018
Merged

nixnote2: fix window icon and themes #50404

merged 1 commit into from Nov 16, 2018

Conversation

bts
Copy link
Contributor

@bts bts commented Nov 15, 2018 •
edited

Motivation for this change

nixnote2 was missing a file that the upstream author recommends to manually install into share -- themes.ini. See baumgarr/nixnote2#320. Without this change, the application does not support any theme except for the default.

While making this change I noticed that postInstall was typo'd (as postInstal) preventing the application's icon from being installed correctly.

Things done

I tested the binary file via nix-env -f . -iA nixnote2 on NixOS -- the application icon and selection of themes were fixed.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-review wip"
  • Tested execution of all binary files
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

@bts
nixnote2: fix window icon and themes
2deaa54 
This installs `theme.ini` into `shared` as described at baumgarr/nixnote2#320.
@c0bw3b
Copy link
Contributor

c0bw3b commented Nov 16, 2018

@GrahamcOfBorg build nixnote2

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: nixnote2

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/rl0wwb6anghj85a0qz05vxvcsg3sxipp-nixnote2-2.0.2
shrinking /nix/store/rl0wwb6anghj85a0qz05vxvcsg3sxipp-nixnote2-2.0.2/bin/nixnote2
strip is /nix/store/vcc4svb8gy29g4pam2zja6llkbcwsyiq-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/rl0wwb6anghj85a0qz05vxvcsg3sxipp-nixnote2-2.0.2/bin
patching script interpreter paths in /nix/store/rl0wwb6anghj85a0qz05vxvcsg3sxipp-nixnote2-2.0.2
checking for references to /build in /nix/store/rl0wwb6anghj85a0qz05vxvcsg3sxipp-nixnote2-2.0.2...
postPatchMkspecs
postPatchMkspecs
/nix/store/rl0wwb6anghj85a0qz05vxvcsg3sxipp-nixnote2-2.0.2

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: nixnote2

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/1n81w8sppqipfq96kpqk899dxcxrg3gm-nixnote2-2.0.2
shrinking /nix/store/1n81w8sppqipfq96kpqk899dxcxrg3gm-nixnote2-2.0.2/bin/nixnote2
strip is /nix/store/p9akxn2sfy4wkhqdqa3li97pc6jaz3r1-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/1n81w8sppqipfq96kpqk899dxcxrg3gm-nixnote2-2.0.2/bin
patching script interpreter paths in /nix/store/1n81w8sppqipfq96kpqk899dxcxrg3gm-nixnote2-2.0.2
checking for references to /build in /nix/store/1n81w8sppqipfq96kpqk899dxcxrg3gm-nixnote2-2.0.2...
postPatchMkspecs
postPatchMkspecs
/nix/store/1n81w8sppqipfq96kpqk899dxcxrg3gm-nixnote2-2.0.2

@c0bw3b
Copy link
Contributor

c0bw3b commented Nov 16, 2018

Thanks for the contribution and welcome. :)

You tested that nixnote is indeed finding the ini file when installed in $out/share/nixnote2/theme.ini ?
And that you were able to load another theme.

@bts
Copy link
Contributor Author

bts commented Nov 16, 2018

Thanks @c0bw3b! Yes I tested the theme support -- I now see different themes available from a menu within the application, and I can switch between them.

@c0bw3b c0bw3b merged commit 4d402da into NixOS:master Nov 16, 2018
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
8.has: package (update) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 12. first-time contribution
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@bts @c0bw3b @GrahamcOfBorg @Janik-Haag