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.

Sign up for GitHub

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

Jump to bottom

plank: init at 0.11.4 #40153

Merged
merged 3 commits into from May 10, 2018
Merged

plank: init at 0.11.4 #40153

merged 3 commits into from May 10, 2018

Conversation

davidak
Copy link
Member

@davidak davidak commented May 7, 2018 •
edited

Motivation for this change

I want a nice dock.

screenshot_2018-05-08_01-41-33

Also part of the pantheon desktop, that hopefully will be complete some day.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

Mic92
Mic92 reviewed May 8, 2018
View reviewed changes
pkgs/development/libraries/bamf/default.nix Outdated
sha256 = "051vib8ndp09ph5bfwkgmzda94varzjafwxf6lqx7z1s8rd7n39l";
};

propagatedBuildInputs = [glib gobjectIntrospection];
Copy link
Member

Choose a reason for hiding this comment

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

Why is it propagating here?

Copy link
Member Author

@davidak davidak May 8, 2018 •
edited

Choose a reason for hiding this comment

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

i just copied it from some other package and it worked. changed

after moving them the build of plank fails:

error: Package `gee-0.8' not found in specified Vala API directories or GObject-Introspection GIR directories
error: Package `Dbusmenu-0.4' not found in specified Vala API directories or GObject-Introspection GIR directories
error: Package `DbusmenuGtk3-0.4' not found in specified Vala API directories or GObject-Introspection GIR directories
Compilation failed: 3 error(s), 0 warning(s)

i had to add gobjectIntrospection as a dependency. is it better that way than propagating it?

Mic92
Mic92 reviewed May 8, 2018
View reviewed changes
pkgs/applications/misc/plank/default.nix Outdated

propagatedUserEnvPkgs = [
gnome3.dconf
];
Copy link
Member

@Mic92 Mic92 May 8, 2018 •
edited

Choose a reason for hiding this comment

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

Is not this usually solved by adding wrapGAppsHook?

Mic92
Mic92 reviewed May 8, 2018
View reviewed changes
pkgs/applications/misc/plank/default.nix Outdated

buildInputs = [ vala atk cairo glib glibc gnome3.gnome-menus
gtk3 gnome3.libgee libwnck3 libX11 libXfixes
libXi pango gnome3.gnome-common pkgconfig bamf gdk_pixbuf
Copy link
Member

Choose a reason for hiding this comment

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

pkgconfig also belongs to nativeBuildInputs.

Mic92
Mic92 reviewed May 8, 2018
View reviewed changes
pkgs/applications/misc/plank/default.nix Outdated
wrapGAppsHook
];

buildInputs = [ vala atk cairo glib glibc gnome3.gnome-menus
Copy link
Member

Choose a reason for hiding this comment

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

I don't think you have to add glibc here.

@davidak
Copy link
Member Author

davidak commented May 8, 2018

@Mic92 thanks for the feedback.
I changed it corresponding to your suggestions.

@davidak
Copy link
Member Author

davidak commented May 10, 2018

Previously tested with XFCE. Now i can also confirm that it works on GNOME 3 desktop!

@Mic92
Copy link
Member

Mic92 commented May 10, 2018

@GrahamcOfBorg build plank

Mic92
Mic92 approved these changes May 10, 2018
View reviewed changes
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.

Can be merged if borg passes the build.

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: plank

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: plank

Partial log (click to expand)

shrinking /nix/store/hj163vwsl479w1kj8v075szgqv036wa6-plank-0.11.4/lib/plank/docklets/libdocklet-cpumonitor.so
shrinking /nix/store/hj163vwsl479w1kj8v075szgqv036wa6-plank-0.11.4/lib/plank/docklets/libdocklet-desktop.so
shrinking /nix/store/hj163vwsl479w1kj8v075szgqv036wa6-plank-0.11.4/lib/plank/docklets/libdocklet-trash.so
shrinking /nix/store/hj163vwsl479w1kj8v075szgqv036wa6-plank-0.11.4/bin/.plank-wrapped
gzipping man pages under /nix/store/hj163vwsl479w1kj8v075szgqv036wa6-plank-0.11.4/share/man/
strip is /nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/hj163vwsl479w1kj8v075szgqv036wa6-plank-0.11.4/lib  /nix/store/hj163vwsl479w1kj8v075szgqv036wa6-plank-0.11.4/bin
patching script interpreter paths in /nix/store/hj163vwsl479w1kj8v075szgqv036wa6-plank-0.11.4
checking for references to /build in /nix/store/hj163vwsl479w1kj8v075szgqv036wa6-plank-0.11.4...
/nix/store/hj163vwsl479w1kj8v075szgqv036wa6-plank-0.11.4

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: plank

Partial log (click to expand)

shrinking /nix/store/qfwa8sjylkj9wri1j4wsw6rdx0kgjdym-plank-0.11.4/lib/plank/docklets/libdocklet-cpumonitor.so
shrinking /nix/store/qfwa8sjylkj9wri1j4wsw6rdx0kgjdym-plank-0.11.4/lib/plank/docklets/libdocklet-clock.so
shrinking /nix/store/qfwa8sjylkj9wri1j4wsw6rdx0kgjdym-plank-0.11.4/lib/plank/docklets/libdocklet-clippy.so
shrinking /nix/store/qfwa8sjylkj9wri1j4wsw6rdx0kgjdym-plank-0.11.4/lib/libplank.so.1.0.0
gzipping man pages under /nix/store/qfwa8sjylkj9wri1j4wsw6rdx0kgjdym-plank-0.11.4/share/man/
strip is /nix/store/gp7fylxwn18b7pl2c18ks89hsiaxyfvf-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/qfwa8sjylkj9wri1j4wsw6rdx0kgjdym-plank-0.11.4/lib  /nix/store/qfwa8sjylkj9wri1j4wsw6rdx0kgjdym-plank-0.11.4/bin
patching script interpreter paths in /nix/store/qfwa8sjylkj9wri1j4wsw6rdx0kgjdym-plank-0.11.4
checking for references to /build in /nix/store/qfwa8sjylkj9wri1j4wsw6rdx0kgjdym-plank-0.11.4...
/nix/store/qfwa8sjylkj9wri1j4wsw6rdx0kgjdym-plank-0.11.4

@Mic92 Mic92 merged commit 3e8a0c0 into NixOS:master May 10, 2018
@davidak davidak deleted the plank branch May 17, 2018 08:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Mic92 approved these changes

Assignees
No one assigned
Labels
8.has: package (new) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@davidak @Mic92 @GrahamcOfBorg