swappy: Init at 1.2.1 #81116

matthiasbeyer · 2020-02-26T12:29:15Z

WIP because waiting for

Things done

doronbehar · 2020-03-22T14:07:42Z

pkgs/applications/misc/swappy/default.nix

+    sha256 = "08r9hmhzzb5ac4g6zwm7w05n99v0hl2h0w4d8i694hg4pyjxb95y";
+  };
+
+  buildInputs = [ meson ninja pkgconfig cmake scdoc gio-sharp libnotify gtk pango cairo wayland];


So upstream said:

gio-sharp does not exist in Arch.

Are you sure gio-sharp is absolutely needed? How come he hasn't said so?

I get errors without it, e.g.:

../src/pixbuf.c:3:10: fatal error: gio/gunixoutputstream.h: No such file or directory 3 | #include <gio/gunixoutputstream.h>

It's part of glib2 on Arch. Somehow it compiles fine on Arch without specifying the lib explicitly. I just pushed a fix in the meson build file.

doronbehar · 2020-03-22T14:07:52Z

pkgs/applications/misc/swappy/default.nix

+  buildInputs = [ meson ninja pkgconfig cmake scdoc gio-sharp libnotify gtk pango cairo wayland];
+
+  meta = {
+    homepage = https://github.com/jtheoof/swappy;


Suggested change

homepage = https://github.com/jtheoof/swappy;

homepage = "https://github.com/jtheoof/swappy";

doronbehar · 2020-03-22T14:12:29Z

pkgs/applications/misc/swappy/default.nix

+  };
+
+  buildInputs = [ meson ninja pkgconfig cmake scdoc gio-sharp libnotify gtk pango cairo wayland];
+


As for jtheoof/swappy#10 , try to add (untested):

nativeBuildInputs = [ glibc.dev ];

Source: https://linux.die.net/man/3/clock_gettime + nix-locate unistd.h.

Did not work:

../src/buffer.c: In function 'randname': ../src/buffer.c:12:3: error: implicit declaration of function 'clock_gettime' [-Werror=implicit-function-declaration] 12 | clock_gettime(CLOCK_REALTIME, &ts); | ^~~~~~~~~~~~~ ../src/buffer.c:12:17: error: 'CLOCK_REALTIME' undeclared (first use in this function) 12 | clock_gettime(CLOCK_REALTIME, &ts); | ^~~~~~~~~~~~~~ ../src/buffer.c:12:17: note: each undeclared identifier is reported only once for each function it appears in ../src/buffer.c: In function 'create_shm_file': ../src/buffer.c:45:7: error: implicit declaration of function 'ftruncate'; did you mean 'strncat'? [-Werror=implicit-function-declaration] 45 | if (ftruncate(fd, size) < 0) { | ^~~~~~~~~ | strncat cc1: all warnings being treated as errors

This should be fixed now too.

jtheoof · 2020-05-17T23:26:06Z

The latest build from master should compile better. Let me know if you're still having issues. Any help is appreciated too, I don't have NixOS installed.

bbigras · 2020-06-21T16:46:56Z

1.0.0 is out. https://github.com/jtheoof/swappy/releases

@matthiasbeyer don't hesitate to say if you don't have the time for this PR anymore. One of us could pick it up.

matthiasbeyer · 2020-06-21T17:49:20Z

No, I'm fine. I pushed an update to 1.0.0, but it still fails to compile because of gio and I'm failing to find a fix.

jtheoof · 2020-06-21T19:30:54Z

Can't really help you, I don't have nixOS installed. On Arch, gio.h is part of glib2.

bbigras · 2020-06-26T15:40:23Z

pkgs/applications/misc/swappy/default.nix

+  nativeBuildInputs = [ glibc.dev ];
+
+  buildInputs = [ meson ninja pkgconfig cmake scdoc gio-sharp libnotify gtk pango cairo wayland];
+


~~It builds with this change:~~

Suggested change

preConfigure = ''

sed -i "s#gio/gunixoutputstream.h#gio-unix-2.0/gio/gunixoutputstream.h#" src/pixbuf.c

'';

Or maybe there's a way to add ${glib.dev}/include/gio-unix-2.0 to the include path.

Just use:

mesonFlags = [ # TODO: https://github.com/NixOS/nixpkgs/issues/36468 "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" ];

and you can remove the nativeBuildInputs

and you can remove gio-sharp.

jtheoof · 2020-06-26T16:29:12Z

There was a recent patch in swappy: jtheoof/swappy#42 that changes slightly how gio is found during meson configuration. It might help you a little.

bbigras · 2020-06-26T16:41:02Z

jtheoof/swappy@606ce38 has the same problem.

bbigras · 2020-07-05T15:03:32Z

@matthiasbeyer friendly ping

matthiasbeyer · 2020-07-06T17:48:16Z

Not sure what I should do here.

bbigras · 2020-07-06T17:50:33Z

try adding:

  mesonFlags = [
    # TODO: https://github.com/NixOS/nixpkgs/issues/36468
    "-Dc_args=-I${glib.dev}/include/gio-unix-2.0"
  ];

You can check the URL for more info.

matthiasbeyer · 2020-07-06T18:53:20Z

Fixed thanks to @bbigras and #36468 and also updated to release 1.2.0.

bbigras · 2020-07-11T22:35:26Z

pkgs/applications/misc/swappy/default.nix

+
+  nativeBuildInputs = [ glibc.dev ];
+
+  buildInputs = [ meson ninja pkgconfig cmake scdoc gio-sharp libnotify gtk pango cairo wayland];


build time only dependencies are declared in nativeBuildInputs
https://nixos.org/nixpkgs/manual/#reviewing-contributions-new-packages

So I guess at least: meson, ninja, pkgconfig, cmake. Not sure about the others.

and it looks like "glibc.dev" can be removed;

bbigras · 2020-07-11T22:37:15Z

pkgs/top-level/all-packages.nix

@@ -2235,6 +2235,8 @@ in

  bash-supergenpass = callPackage ../tools/security/bash-supergenpass { };

+  swappy = callPackage ../applications/misc/swappy { gtk = gtk3; };


flameshot, a similar tool is in pkgs/tools/misc/flameshot. Not sure if it's important.

bbigras · 2020-07-11T22:39:34Z

pkgs/applications/misc/swappy/default.nix

+
+  meta = {
+    homepage = "https://github.com/jtheoof/swappy";
+    description = "A Wayland native snapshot editing tool, inspired by Snappy on macOS ";


maybe remove the whitespace at the end

bbigras · 2020-07-12T00:26:48Z

it seems gio-sharp can be removed too.

I was able to build using:

  nativeBuildInputs = [ glib meson ninja pkgconfig cmake scdoc ];
  buildInputs = [ cairo pango gtk libnotify wayland glib ];
  strictDeps = true;

Not sure why I need glib in both places.

bbigras · 2020-07-21T17:06:43Z

@matthiasbeyer friendly ping

matthiasbeyer · 2020-07-22T06:56:51Z

With your suggested change:

[16/18] Compiling C object 'swappy@exe/src_pixbuf.c.o'.o'.ppy.c.o'.
FAILED: swappy@exe/src_pixbuf.c.o
/nix/store/1kn7fi3hhi33jms3113riyzwyn2yqpqd-gcc-wrapper-9.2.0/bin/cc -Iswappy@exe -I. -I.. -I../include -Ires -I/nix/store/a92yhf0icjl9lh553s4qjchdsm8lyzsy-cairo-1.16.0-dev/include/cairo -I/nix/store/1zlkr4x0bvxw3mn65chw9v3b48n8jh52-freetype-2.10.1-dev/include/freetype2 -I/nix/store/1zlkr4x0bvxw3mn65chw9v3b48n8jh52-freetype-2.10.1-dev/include -I/nix/store/5ad0cyv6lxpkk2m1prcrasdp2pysz73q-glib-2.62.4-dev/include -I/nix/store/5ad0cyv6lxpkk2m1prcrasdp2pysz73q-glib-2.62.4-dev/include/glib-2.0 -I/nix/store/vwvjrh97byihk40gwl26f0lnb3w405cv-glib-2.62.4/lib/glib-2.0/include -I/nix/store/sm843466f7cvhf1b804jjlay1nv7fyq0-pango-1.44.7-dev/include/pango-1.0 -I/nix/store/70yjv9sr9mhf75bliwmmxgyr37mx9lac-harfbuzz-2.6.4-dev/include/harfbuzz -I/nix/store/i5yw4gdhknqahzhkaqjfbgc9ydb2885w-gtk+3-3.24.13-dev/include/gtk-3.0 -I/nix/store/vmm5hrcbqrb7b605dnir17qbiz85x17n-atk-2.34.1-dev/include/atk-1.0 -I/nix/store/4w16ai3cx8sp7av9kc432w34r4fpdmfp-gdk-pixbuf-2.40.0-dev/include/gdk-pixbuf-2.0 -I/nix/store/i1mssjnbih9czf12fcda1883pvkirgss-libnotify-0.7.8-dev/include -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Werror -std=c11 -Wno-unused-parameter -DHAVE_LIBNOTIFY -MD -MQ 'swappy@exe/src_pixbuf.c.o' -MF 'swappy@exe/src_pixbuf.c.o.d' -o 'swappy@exe/src_pixbuf.c.o' -c ../src/pixbuf.c
../src/pixbuf.c:4:10: fatal error: gio/gunixoutputstream.h: No such file or directory
    4 | #include <gio/gunixoutputstream.h>
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
[17/18] Compiling C object 'swappy@exe/src_render.c.o'.
ninja: build stopped: subcommand failed.
builder for '/nix/store/v3frm48zb0pp5j2r74g1sh0h5s1maacg-swappy-1.0.0.drv' failed with exit code 1
error: build of '/nix/store/v3frm48zb0pp5j2r74g1sh0h5s1maacg-swappy-1.0.0.drv' faile

bbigras · 2020-07-25T17:40:00Z

@GrahamcOfBorg build swappy

bbigras · 2020-07-25T17:42:57Z

nixos-discourse · 2020-07-25T17:44:44Z

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/230

blaggacao · 2020-07-25T17:56:06Z

Just noticed v1.2.1 was cut 14 days ago.
https://github.com/jtheoof/swappy/tree/v1.2.1

Not meaning to block anything.

pkgs/applications/misc/swappy/default.nix

bbigras · 2020-08-09T04:52:33Z

@matthiasbeyer friendly ping

jonringer · 2020-08-09T09:03:06Z

since this is the first time it's been packaged, I think it should be a single commit. I don't see much value in having 5 commits.

bbigras · 2020-08-19T14:49:02Z

@matthiasbeyer friendly ping. Can we get this in the release please?

matthiasbeyer · 2020-08-19T14:54:53Z

Sure, what's missing from your point of view?

bbigras · 2020-08-19T15:04:11Z

I already approved but maybe Jon's meta suggestion and squash the commits and it will be good to go.

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>

bbigras · 2020-09-07T18:48:26Z

@jonringer can you merge this please?

nixos-discourse · 2020-09-11T20:36:01Z

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/219

berbiche · 2020-09-24T23:26:37Z

Friendly ping @jonringer since two weeks have passed since the last one.

I'm looking forward to using this new tool in my workflow.

It would also be great if this package was backported to the 20.09 release (unless the window is closed?).

bbigras · 2020-09-28T05:55:12Z

@marsam help merge this please. Jon must be pretty busy these days.

bbigras · 2020-09-28T06:17:10Z

Thank you very much 😄

ofborg bot added 8.has: package (new) This PR adds a new package 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 1-10 labels Feb 26, 2020

doronbehar requested changes Mar 22, 2020

View reviewed changes

ofborg bot added the 10.rebuild-linux: 1 label Jun 21, 2020

bbigras reviewed Jun 26, 2020

View reviewed changes

matthiasbeyer force-pushed the add-swappy branch from 65e97bd to 06b96e5 Compare July 6, 2020 18:53

matthiasbeyer changed the title ~~WIP: swappy: Init at 2020-02-26~~ swappy: Init at 1.2.0 Jul 6, 2020

matthiasbeyer force-pushed the add-swappy branch from 06b96e5 to 74e41ce Compare July 6, 2020 18:54

bbigras reviewed Jul 11, 2020

View reviewed changes

bbigras approved these changes Jul 25, 2020

View reviewed changes

jonringer reviewed Jul 30, 2020

View reviewed changes

pkgs/applications/misc/swappy/default.nix Outdated Show resolved Hide resolved

matthiasbeyer force-pushed the add-swappy branch from 5120e7a to e943f90 Compare August 9, 2020 08:17

matthiasbeyer changed the title ~~swappy: Init at 1.2.0~~ swappy: Init at 1.2.1 Aug 9, 2020

swappy: init at 1.2.1

a04e96d

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>

matthiasbeyer force-pushed the add-swappy branch from e943f90 to a04e96d Compare August 19, 2020 19:53

marsam approved these changes Sep 28, 2020

View reviewed changes

marsam merged commit 692f58d into NixOS:master Sep 28, 2020

matthiasbeyer deleted the add-swappy branch September 28, 2020 11:52

	homepage = https://github.com/jtheoof/swappy;
	homepage = "https://github.com/jtheoof/swappy";

		};

		buildInputs = [ meson ninja pkgconfig cmake scdoc gio-sharp libnotify gtk pango cairo wayland];

		nativeBuildInputs = [ glibc.dev ];

		buildInputs = [ meson ninja pkgconfig cmake scdoc gio-sharp libnotify gtk pango cairo wayland];

+  preConfigure = ''
+    sed -i "s#gio/gunixoutputstream.h#gio-unix-2.0/gio/gunixoutputstream.h#" src/pixbuf.c
+  '';

		@@ -2235,6 +2235,8 @@ in

		bash-supergenpass = callPackage ../tools/security/bash-supergenpass { };

		swappy = callPackage ../applications/misc/swappy { gtk = gtk3; };

swappy: Init at 1.2.1 #81116

swappy: Init at 1.2.1 #81116

Conversation

matthiasbeyer commented Feb 26, 2020

Things done

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jtheoof commented May 17, 2020

bbigras commented Jun 21, 2020

matthiasbeyer commented Jun 21, 2020

jtheoof commented Jun 21, 2020

bbigras Jun 26, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jtheoof commented Jun 26, 2020

bbigras commented Jun 26, 2020

bbigras commented Jul 5, 2020

matthiasbeyer commented Jul 6, 2020

bbigras commented Jul 6, 2020

matthiasbeyer commented Jul 6, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bbigras commented Jul 12, 2020

bbigras commented Jul 21, 2020

matthiasbeyer commented Jul 22, 2020

bbigras commented Jul 25, 2020

bbigras commented Jul 25, 2020

Reviewed points

Possible improvements

Comments

nixos-discourse commented Jul 25, 2020

blaggacao commented Jul 25, 2020

bbigras commented Aug 9, 2020

jonringer commented Aug 9, 2020

bbigras commented Aug 19, 2020

matthiasbeyer commented Aug 19, 2020

bbigras commented Aug 19, 2020

bbigras commented Sep 7, 2020

nixos-discourse commented Sep 11, 2020

berbiche commented Sep 24, 2020

bbigras commented Sep 28, 2020

bbigras commented Sep 28, 2020

bbigras Jun 26, 2020 •

edited

Loading