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

drawpile: init at 2.0.10 #41920

Merged
merged 1 commit into from Aug 31, 2018
Merged

drawpile: init at 2.0.10 #41920

merged 1 commit into from Aug 31, 2018

Conversation

fgaz
Copy link
Member

@fgaz fgaz commented Jun 13, 2018 •
edited

Motivation for this change
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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

There's only one issue that I found: I can't get the icons to show up when I run ./result/bin/drawpile . Maybe it's because i use a window manager instead of a full de?

Edit: wait... once the package is installed with nix-env -i the icons show up. Is this normal?

nlewo
nlewo requested changes Jun 13, 2018
View reviewed changes
pkgs/applications/graphics/drawpile/default.nix Outdated

meta = with stdenv.lib; {
description = "A Free software collaborative drawing program that allows multiple users to sketch on the same canvas simultaneously";
homepage = "https://drawpile.net/";
Copy link
Member

Choose a reason for hiding this comment

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

Do not use " for urls

pkgs/applications/graphics/drawpile/default.nix Outdated
meta = with stdenv.lib; {
description = "A Free software collaborative drawing program that allows multiple users to sketch on the same canvas simultaneously";
homepage = "https://drawpile.net/";
downloadPage = "https://drawpile.net/download/";
Copy link
Member

Choose a reason for hiding this comment

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

Do not use " for urls

pkgs/applications/graphics/drawpile/default.nix Outdated
configurePhase = "cmake -DCMAKE_INSTALL_PREFIX=$out .";

meta = with stdenv.lib; {
description = "A Free software collaborative drawing program that allows multiple users to sketch on the same canvas simultaneously";
Copy link
Member

Choose a reason for hiding this comment

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

The licence already says it's a free software:
's/Free software //'

@nlewo
Copy link
Member

nlewo commented Jun 13, 2018

@GrahamcOfBorg build drawpile

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Attempted: drawpile

Partial log (click to expand)

                                                                 ^~~~~~~~~~~~~~
/build/drawpile-2.0.10/src/desktop/drawpile_autogen/IMAN36LHMA/moc_userlistwidget.cpp:127:65: note: suggested alternative: 'muteSelected'
         case 10: _t->selectionChanged((*reinterpret_cast< const QItemSelection(*)>(_a[1]))); break;
                                                                 ^~~~~~~~~~~~~~
                                                                 muteSelected
make[2]: *** [src/desktop/CMakeFiles/drawpile.dir/build.make:1192: src/desktop/CMakeFiles/drawpile.dir/drawpile_autogen/mocs_compilation.cpp.o] Error 1
make[1]: *** [CMakeFiles/Makefile2:293: src/desktop/CMakeFiles/drawpile.dir/all] Error 2
make: *** [Makefile:130: all] Error 2
builder for '/nix/store/mi9nxh9l78cszyf56w76hamnrd0mw2nw-drawpile-2.0.10.drv' failed with exit code 2
error: build of '/nix/store/mi9nxh9l78cszyf56w76hamnrd0mw2nw-drawpile-2.0.10.drv' failed

@fgaz
Copy link
Member Author

fgaz commented Jun 13, 2018 •
edited

@nlewo fixed the meta

but I forgot again to rebuild after rebasing on master. I'll fix that.

Edit: in the meantime if anyone needs it I uploaded a working derivation (/nix/store/x0wdvl6pmk2s7kd04glykrdyxq7rx8w7-drawpile-2.0.10) on fgaz.cachix.org

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: drawpile

Partial log (click to expand)

                                                                 ^~~~~~~~~~~~~~
/build/drawpile-2.0.10/src/desktop/drawpile_autogen/IMAN36LHMA/moc_userlistwidget.cpp:127:65: note: suggested alternative: 'muteSelected'
         case 10: _t->selectionChanged((*reinterpret_cast< const QItemSelection(*)>(_a[1]))); break;
                                                                 ^~~~~~~~~~~~~~
                                                                 muteSelected
make[2]: *** [src/desktop/CMakeFiles/drawpile.dir/build.make:1192: src/desktop/CMakeFiles/drawpile.dir/drawpile_autogen/mocs_compilation.cpp.o] Error 1
make[1]: *** [CMakeFiles/Makefile2:293: src/desktop/CMakeFiles/drawpile.dir/all] Error 2
make: *** [Makefile:130: all] Error 2
builder for '/nix/store/nadnxvmlcx3sd529d9d0brgcdns1bb4f-drawpile-2.0.10.drv' failed with exit code 2
error: build of '/nix/store/nadnxvmlcx3sd529d9d0brgcdns1bb4f-drawpile-2.0.10.drv' failed

@fgaz fgaz mentioned this pull request Jun 15, 2018
Closed
@fgaz
Copy link
Member Author

fgaz commented Jun 15, 2018

The build failure is related to cmake 3.11. I opened an issue upstream: drawpile/Drawpile#625

@nlewo
Copy link
Member

nlewo commented Jun 16, 2018

Did you try with cmake_2_8 (which is available in nixpkgs)?

@fgaz
Copy link
Member Author

fgaz commented Jun 16, 2018

@nlewo 3.10 is also available and works (cmake.override {majorVersion="3.10";}), but I'd rather wait for a release and not pin cmake if you are ok with that

@nlewo
Copy link
Member

nlewo commented Jun 16, 2018

@fgaz yes, it's better to wait for a release. Ping me when it is done.

@nlewo nlewo added the 2.status: wait-for-upstream Waiting for upstream fix (or their other action). label Jun 16, 2018
@fgaz
Copy link
Member Author

fgaz commented Aug 26, 2018

@nlewo 2.0.11 got released with the fix. I updated the package

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: drawpile

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/g8i8m3bhxi9zvd28a9gi2lx5l369kq86-drawpile-2.0.11
shrinking /nix/store/g8i8m3bhxi9zvd28a9gi2lx5l369kq86-drawpile-2.0.11/bin/drawpile-2.0.11
shrinking /nix/store/g8i8m3bhxi9zvd28a9gi2lx5l369kq86-drawpile-2.0.11/bin/drawpile-srv
gzipping man pages under /nix/store/g8i8m3bhxi9zvd28a9gi2lx5l369kq86-drawpile-2.0.11/share/man/
strip is /nix/store/h0lbngpv6ln56hjj59i6l77vxq25flbz-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/g8i8m3bhxi9zvd28a9gi2lx5l369kq86-drawpile-2.0.11/bin
patching script interpreter paths in /nix/store/g8i8m3bhxi9zvd28a9gi2lx5l369kq86-drawpile-2.0.11
checking for references to /build in /nix/store/g8i8m3bhxi9zvd28a9gi2lx5l369kq86-drawpile-2.0.11...
postPatchMkspecs

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: drawpile

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/6lbkgiqy69rlxqyvjawacqsjvd8r1n6b-drawpile-2.0.11
shrinking /nix/store/6lbkgiqy69rlxqyvjawacqsjvd8r1n6b-drawpile-2.0.11/bin/drawpile-srv
shrinking /nix/store/6lbkgiqy69rlxqyvjawacqsjvd8r1n6b-drawpile-2.0.11/bin/drawpile-2.0.11
gzipping man pages under /nix/store/6lbkgiqy69rlxqyvjawacqsjvd8r1n6b-drawpile-2.0.11/share/man/
strip is /nix/store/y4ymnvgxygpq05h03kyzbj572zmh6zla-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/6lbkgiqy69rlxqyvjawacqsjvd8r1n6b-drawpile-2.0.11/bin
patching script interpreter paths in /nix/store/6lbkgiqy69rlxqyvjawacqsjvd8r1n6b-drawpile-2.0.11
checking for references to /build in /nix/store/6lbkgiqy69rlxqyvjawacqsjvd8r1n6b-drawpile-2.0.11...
postPatchMkspecs

@fgaz
Copy link
Member Author

fgaz commented Aug 31, 2018

@nlewo can we merge this before the branch-off?

@nlewo
Copy link
Member

nlewo commented Aug 31, 2018

Yes. Sorry for the latency. Thx!

@nlewo nlewo merged commit fc39e5c into NixOS:master Aug 31, 2018
@fgaz fgaz deleted the drawpile branch August 31, 2018 16:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nlewo nlewo nlewo approved these changes

Assignees
No one assigned
Labels
2.status: wait-for-upstream Waiting for upstream fix (or their other action). 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
@fgaz @nlewo @GrahamcOfBorg