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

Make icons squared, and fix build #120

Merged
merged 8 commits into from
Apr 9, 2024
Merged

Conversation

samueldr
Copy link
Member

@samueldr samueldr commented Apr 9, 2024

Fixes #42.

Closes #118


Alright, so the whole gist of it is that since even before #42 was opened I already had this problem in mind that needed to be solved.

Some early "don't want to break things" paralysis prevented me from handling this. And I never had since, for many other reasons, including lack of time and energy.

The solution is to fix the source SVG files here.

The solution also includes dropping everything from the SVG files that was not needed. Those are part of the actual main logo file. Those are artifacts derived from it. So it's fine to drop those "guide" stuff, and even the flat version of the logo.

Also renamed the pair of "snowflake-only" source svg so they are listed alphabetically together. (Also "white" really meant nothing...)


So, why all those unrelated changes?

To fix the build. I had to make those to test the Makefile changes (from the rename).

The changes don't change the semantics of the existing Makefile, but makes a bare nix-build invocation build. Additionally, nix-shell now uses facts from default.nix instead of duplicating the information and invariably diverging.

Comment on lines +19 to +21
install: grub2-installer-theme.tar.gz
mkdir -p "$(install_dest)"
tar --strip-components=1 --directory "$(install_dest)" -xf "$<"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is silly, but eh, this tests the tar.gz build via the Nix output. If/when CI/CD is done in here, this ensures the tarball is "tested".

@samueldr samueldr changed the title Makes icons squared, and fixes build Make icons squared, and fixes build Apr 9, 2024
@samueldr samueldr changed the title Make icons squared, and fixes build Make icons squared, and fix build Apr 9, 2024
Copy link
Contributor

@OPNA2608 OPNA2608 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Resulting icons look fine, and nix-build works again. Thanks!

Some non-critical nits, otherwise LGTM.

default.nix Outdated Show resolved Hide resolved
default.nix Outdated Show resolved Hide resolved
samueldr and others added 8 commits April 9, 2024 18:00
 + rename (to group with the coloured one)
 + drop pre-rendered version
 + rename to group with white version
We are not renaming the outputs, as they are used as an ad-hoc API.
Co-authored-by: Cosima Neidahl <opna2608@protonmail.com>
Co-authored-by: Cosima Neidahl <opna2608@protonmail.com>
@samueldr samueldr merged commit f84c13a into NixOS:master Apr 9, 2024
@samueldr samueldr deleted the fix/squared-icons branch April 9, 2024 22:01
@samueldr
Copy link
Member Author

samueldr commented Apr 9, 2024

Thank you for the additional nits!

@samueldr
Copy link
Member Author

samueldr commented Apr 9, 2024

(I'll note that Nixpkgs has not been changed.)

@OPNA2608
Copy link
Contributor

NixOS/nixpkgs#303068 for updating it in Nixpkgs.

trueNAHO added a commit to trueNAHO/stylix that referenced this pull request Apr 10, 2024
danth pushed a commit to danth/stylix that referenced this pull request Apr 10, 2024
trueNAHO added a commit to trueNAHO/stylix that referenced this pull request Apr 11, 2024
Update the SHA due to changed contents of the SVG file [1].

[1]: NixOS/nixos-artwork#120
danth pushed a commit to danth/stylix that referenced this pull request Apr 13, 2024
Remove the 'substituteInPlace' function call because the new SVG no
longer contains the matching patterns.

Closes: #337

Updates the SHA due to changed contents of the SVG file:
NixOS/nixos-artwork#120
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Square logo?
2 participants