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

qjournalctl: init at 0.6.2 #78815

Closed
wants to merge 1 commit into from
Closed

qjournalctl: init at 0.6.2 #78815

wants to merge 1 commit into from

Conversation

SRGOM
Copy link
Member

@SRGOM SRGOM commented Jan 30, 2020

Motivation for this change

bring back https://github.com/NixOS/nixpkgs/pull/55762/commits from dead

Things done

Copy pasted aanderse's code plus some qt specific changes plus a version bump

  • 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.

@SRGOM
Copy link
Member Author

SRGOM commented Jan 30, 2020

Submitted as is. feel free to alprove/reject.

@SRGOM
Copy link
Member Author

SRGOM commented Jan 30, 2020

@dtzWill seeing as you have commit permission too and were the original author of #55762 , perhaps you'd be a better person to review?


meta = with stdenv.lib; {
description = "Qt-based Graphical User Interface for systemd's journalctl command";
homepage = https://github.com/pentix/qjournalctl;
Copy link
Contributor

Choose a reason for hiding this comment

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

Quote URL please.

Copy link
Contributor

@jtojnar jtojnar left a comment

Choose a reason for hiding this comment

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

Looks good, just few notes.

'';

nativeBuildInputs = [ qmake pkgconfig libssh ];
buildInputs = [ qtbase wrapQtAppsHook];
Copy link
Contributor

Choose a reason for hiding this comment

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

wrapQtAppsHook belongs to nativeBuildInputs.

substituteInPlace qjournalctl.pro --replace /usr/ $out/
'';

nativeBuildInputs = [ qmake pkgconfig libssh ];
Copy link
Contributor

Choose a reason for hiding this comment

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

In new expressions, pkg-config should be used instead of the pkgconfig alias.

Copy link
Contributor

Choose a reason for hiding this comment

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

libssh belongs to buildInputs.

};

postPatch = ''
substituteInPlace qjournalctl.pro --replace /usr/ $out/
Copy link
Contributor

Choose a reason for hiding this comment

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

It might be nice to have this configurable through makeFlags like here: jamulussoftware/jamulus#247

Copy link
Contributor

Choose a reason for hiding this comment

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

I'm trying to pick up this PR. How could this be achieved? By providing a patch for the .pro file?

qmake,
pkgconfig,
libssh,
wrapQtAppsHook
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
wrapQtAppsHook
wrapQtAppsHook

@@ -0,0 +1,36 @@
{
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
{
{

@stale
Copy link

stale bot commented Jul 4, 2021

I marked this as stale due to inactivity. → More info

@stale stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jul 4, 2021
@romildo romildo mentioned this pull request Jul 4, 2021
11 tasks
@romildo
Copy link
Contributor

romildo commented Jul 4, 2021

Closing in favour of #129246

@romildo romildo closed this Jul 4, 2021
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

6 participants