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

librecad: add .desktop file and icon #60008

Merged
merged 1 commit into from Apr 26, 2019
Merged

Conversation

lightbulbjim
Copy link
Contributor

Motivation for this change

Use the .desktop file and app icon included in the source package.

Things done
  • 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 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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@JohnAZoidberg
Copy link
Member

Nice, thanks! I didn't check whether the icons show up but the directories are correct.

Just an optional suggestion, you could use install -D src dest to copy the file and create the directory at the same time.

@lightbulbjim
Copy link
Contributor Author

Just an optional suggestion, you could use install -D src dest to copy the file and create the directory at the same time.

Thanks, I'll probably do that going forward (I've been adding XDG files to a bunch of packages which are missing them). If you'd rather see this switched over to use install then I'm happy to do so.

@JohnAZoidberg
Copy link
Member

I personally think it's clearer and less cluttery. You can immediately see that the file is copied to the directory you're creating.
And it's included in coreutils so everybody should have it and know about it.

Use the .desktop file and app icon included in the source package.
@lightbulbjim
Copy link
Contributor Author

Fair enough. I've updated it to use install and I agree that it does look cleaner.

@@ -18,8 +18,11 @@ stdenv.mkDerivation rec {
qmakeFlags = [ "MUPARSER_DIR=${muparser}" "BOOST_DIR=${boost.dev}" ];

installPhase = ''
mkdir -p $out/bin $out/share
cp -R unix/librecad $out/bin
Copy link
Member

Choose a reason for hiding this comment

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

was there a single binary ? the new version just keeps bin/librecad.

Copy link
Member

Choose a reason for hiding this comment

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

Yes there was, not sure why they used -R before.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Correct, the only file in bin is librecad.

@teto
Copy link
Member

teto commented Apr 26, 2019

built it into nix-review. Looked fine. I didn't how to check for the icon until I realized rofi supported it. I enabled the feature and it showed so merging.

@teto teto merged commit c7eac98 into NixOS:master Apr 26, 2019
@lightbulbjim lightbulbjim deleted the librecad-desktop branch April 26, 2019 03:24
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.

None yet

4 participants