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

awesome-4.0: Add optional hicolor-icon-theme for theme support #22888

Closed
wants to merge 1 commit into from
Closed

awesome-4.0: Add optional hicolor-icon-theme for theme support #22888

wants to merge 1 commit into from

Conversation

ndowens
Copy link
Contributor

@ndowens ndowens commented Feb 17, 2017

Motivation for this change

Add hicolor_icon_theme optional dependency, so 4.0 themes such as https://github.com/copycat-killer/awesome-copycats will work

Things done
  • [x ] Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • [ x] NixOS
    • macOS
    • Linux
  • [x ] Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • [ x] Tested execution of all binary files (usually in ./result/bin/)
  • [x ] Fits CONTRIBUTING.md.

@mention-bot
Copy link

@ndowens, thanks for your PR! By analyzing the history of the files in this pull request, we identified @vcunat, @lethalman and @lovek323 to be potential reviewers.

@ndowens
Copy link
Contributor Author

ndowens commented Feb 17, 2017

Contacted previous maintainer and he replied that he no longer uses Linux so possibly I may take this package up?

@vcunat
Copy link
Member

vcunat commented Feb 17, 2017

You can certainly add yourself to meta.maintainers.

@ndowens
Copy link
Contributor Author

ndowens commented Feb 17, 2017

@vcunat Added myself to maintainers, so I am done editing as long as it looks good to you :)

Copy link
Member

@Mic92 Mic92 left a comment

Choose a reason for hiding this comment

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

Tested and looks good to me except for the two nitpicks mentioned below.

@@ -4,11 +4,17 @@
, compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm
, which, dbus, nettools, git, asciidoc, doxygen
, xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs
, libxkbcommon, xcbutilxrm
, libxkbcommon, xcbutilxrm, lib, pkgs,
Copy link
Member

Choose a reason for hiding this comment

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

Please import hicolor_icon_theme directly rather then use pkgs here. Also we usually access lib by using stdenv.lib.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@Mic92 I believe I changed it to what I believe you mean ?

let
version = "4.0";
available = x: x != null;
Copy link
Member

Choose a reason for hiding this comment

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

Why add it and not use it?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I have no idea, I didn't put it there, I barely changed the nix file :)

Copy link
Member

Choose a reason for hiding this comment

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

The diff indicated the change was yours, but never mind - now it's gone.

Copy link
Contributor Author

@ndowens ndowens Feb 17, 2017

Choose a reason for hiding this comment

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

@vcunat that is weird, but your right seems I did, but don't remember doing it lol;

let
version = "4.0";
in with luaPackages;
assert enableHicolorTheme -> hicolor_icon_theme !=null;
Copy link
Member

Choose a reason for hiding this comment

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

You don't actually use hicolor_icon_theme anywhere (or I'm just very sleepy but browser search seems to agree with me).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@abbradar I think I did what you wanted me to do, by adding it through ++ optional

@abbradar
Copy link
Member

abbradar commented Feb 17, 2017 via email

@ndowens
Copy link
Contributor Author

ndowens commented Feb 17, 2017

@abbradar i had to add it to my environment.systemPackages for it to work; didn't add it to package, though I am trying to test it in VM, but the store is not writeable in build-vm so I am not having success and can't find a setting to enable writablestore

@abbradar
Copy link
Member

Maybe we should just add propagatedUserEnvPkgs = [ hicolor-icon-theme ];? This would make hicolor-icon-theme to be installed in the environment when Awesome is installed automatically.

@ndowens
Copy link
Contributor Author

ndowens commented Feb 17, 2017

@abbradar maybe so, in case people expect 4.0 themes to work automaticly

@abbradar
Copy link
Member

I think installing a default icon theme is okay by default -- you usually need it anyway. BTW you don't need hicolor-icon-theme in buildInputs then.

@ndowens
Copy link
Contributor Author

ndowens commented Feb 17, 2017

@abbradar So put it in propagated? the hicolor_icon_theme is what solved my issue with using 4.0 themes

@abbradar
Copy link
Member

Yep, it should be okay.

Awesome 4.0: Edited meta information

Awesome-4.0: removed pkgs and used hicolor directly

	modified:   pkgs/applications/window-managers/awesome/default.nix

Awesome-4.0: Removed let:in

	modified:   pkgs/applications/window-managers/awesome/default.nix

Awesome-4.0: Added hicolor_icon_theme to optional buildInputs

	modified:   pkgs/applications/window-managers/awesome/default.nix

Awesome-4.0: removed optional and added propagatedUserEnvPkgs

	modified:   pkgs/applications/window-managers/awesome/default.nix
@ndowens
Copy link
Contributor Author

ndowens commented Feb 17, 2017

@abbradar changed, maybe this will work

@abbradar
Copy link
Member

Should be okay now! Pushed to master, thank you for the fix.

@abbradar abbradar closed this in e67416f Feb 17, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants