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

ksmoothdock: init at 6.3 stable #88204

Merged
merged 2 commits into from Jun 4, 2020
Merged

Conversation

SCOTT-HAMILTON
Copy link
Contributor

Motivation for this change

Needed a nice dock for my MacOS KDE theming exerience. For the momen latte dock seems too buggy.

Things done

Packaged ksmoothdock at v6.2 stable

  • 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 nixpkgs-review --run "nixpkgs-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.

@SCOTT-HAMILTON
Copy link
Contributor Author

The patch is currently discussed here dangvd/ksmoothdock#117

@IvarWithoutBones
Copy link
Member

meta doesn't seem to be matching the application

@SCOTT-HAMILTON
Copy link
Contributor Author

Fixed here ed9b1fb

Copy link
Member

@ttuegel ttuegel left a comment

Choose a reason for hiding this comment

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

This needs an entry in pkgs/top-level/all-packages.nix.

pkgs/desktops/plasma-5/ksmoothdock/default.nix Outdated Show resolved Hide resolved
@IvarWithoutBones
Copy link
Member

IvarWithoutBones commented May 28, 2020

That commit just seems to remove the derivation all together?

As for the previous commit that does have the derivation:
https://github.com/NixOS/nixpkgs/blob/ed9b1fb73c5759a2815258972e1965f15735a715/pkgs/desktops/plasma-5/ksmoothdock/default.nix#L31 should use cmakeDir, i think.

Also, the use of lib and stdenv.lib in meta is not consistent. Could just do

  meta = with stdenv.lib; {
    description = "A cool desktop panel for KDE Plasma 5";
    license = licenses.mit;
    homepage = "https://dangvd.github.io/ksmoothdock/";
    maintainers = with maintainers; [ shamilton ];
    platforms = platforms.linux;
  };

and lose the lib attribute, a bit cleaner imo.

Also, shouldn't extra-cmake-modules be a nativeBuildInput?

, qtbase
}:
mkDerivation rec {

Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change

@SCOTT-HAMILTON
Copy link
Contributor Author

Asked cleanup done.

Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

LGTM

Result of nixpkgs-review pr 88204 1

1 package built:
- ksmoothdock

@jonringer jonringer merged commit 397a90a into NixOS:master Jun 4, 2020
@SCOTT-HAMILTON SCOTT-HAMILTON deleted the ksmoothdock branch June 4, 2020 20:52
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