indicator-application-gtk3: 12.10.0 -> 12.10.1 #45052

worldofpeace · 2018-08-15T06:11:46Z

Motivation for this change

I guess elementary needs this version for the ayatana indicators.
I now includes a systemd user service and xdg autostart.

One thing I noticed is that it wanted to install its libraries to /nix/store/-libindicator-gtk3-/lib/indicators3/7.
I hope that's not important.

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/)
Determined the impact on package closure size (by running nix path-info -S before and after)
471815040
471811400
Fits CONTRIBUTING.md.

cc @jtojnar

srhb · 2018-08-15T08:04:31Z

Retriggering eval due to master failure
@GrahamcOfBorg eval

jtojnar · 2018-08-15T08:12:21Z

On a side note, there is a new fork of the indicators spearheaded by the Debian’s Ayatana team. We might want to package it too and ask elementary for its support.

timokau · 2018-08-15T11:06:17Z

pkgs/development/libraries/indicator-application/gtk3.nix

  };

-  nativeBuildInputs = [ pkgconfig autoconf ];
+  nativeBuildInputs = [ pkgconfig autoreconfHook systemd ];


Is systemd actually a nativeBuildInput? If it is used at runtime, it should be a buildInput.

worldofpeace · 2018-08-15T13:04:03Z

@jtojnar I think that's a good idea and something they would be interested in 👍

jtojnar · 2018-08-15T13:19:30Z

pkgs/development/libraries/indicator-application/gtk3.nix

      --replace 'applicationlibdir = $(INDICATORDIR)' "applicationlibdir = $out/lib"
+
+    substituteInPlace configure.ac \
+      --replace 'SYSTEMD_USERDIR=`$PKG_CONFIG --variable=systemduserunitdir systemd`' 'SYSTEMD_USERDIR="$out/lib/systemd/user"'


Can you try setting the PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "$(out)/lib/systemd/user"; attribute in the expression?

jtojnar · 2018-08-15T13:28:42Z

pkgs/development/libraries/indicator-application/gtk3.nix

+    substituteInPlace data/Makefile.am \
+      --replace "/etc/xdg/autostart" "$out/etc/xdg/autostart"
+
+    substituteInPlace src/Makefile.am \
      --replace 'applicationlibdir = $(INDICATORDIR)' "applicationlibdir = $out/lib"


Same here with PKG_CONFIG_INDICATOR3_0_4_INDICATORDIR

Lol I tried that early on but I struggle to get the name right even when I look at the pc file :)

jtojnar · 2018-08-15T13:39:30Z

pkgs/development/libraries/indicator-application/gtk3.nix

  };

-  nativeBuildInputs = [ pkgconfig autoconf ];
+  nativeBuildInputs = [ pkgconfig systemd autoreconfHook ];


Still in native.

Without it there was no $out/lib/systemd

But should not it be in buildInputs instead of nativeBuildInputs?

Oh right. Done.

timokau · 2018-08-15T22:26:19Z

@GrahamcOfBorg build indicator-application-gtk3

GrahamcOfBorg · 2018-08-15T22:26:58Z

Success on x86_64-linux (full log)

Attempted: indicator-application-gtk3

Partial log (click to expand)

glibPreFixupPhase
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/0fmicd36598hlvj4kysc041k0i9as0a0-indicator-application-gtk3-12.10.1
shrinking /nix/store/0fmicd36598hlvj4kysc041k0i9as0a0-indicator-application-gtk3-12.10.1/lib/libapplication.so
shrinking /nix/store/0fmicd36598hlvj4kysc041k0i9as0a0-indicator-application-gtk3-12.10.1/libexec/indicator-application/indicator-application-service
strip is /nix/store/gpc2wld1s0c6qzx9326cwn1wcx29xzsj-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/0fmicd36598hlvj4kysc041k0i9as0a0-indicator-application-gtk3-12.10.1/lib  /nix/store/0fmicd36598hlvj4kysc041k0i9as0a0-indicator-application-gtk3-12.10.1/libexec
patching script interpreter paths in /nix/store/0fmicd36598hlvj4kysc041k0i9as0a0-indicator-application-gtk3-12.10.1
checking for references to /build in /nix/store/0fmicd36598hlvj4kysc041k0i9as0a0-indicator-application-gtk3-12.10.1...
/nix/store/0fmicd36598hlvj4kysc041k0i9as0a0-indicator-application-gtk3-12.10.1

jtojnar · 2018-08-15T22:28:43Z

Just looking into the lib location.

jtojnar · 2018-08-15T22:31:57Z

I do not see anything out of ordinary. Could you clarify what you mean by

it wanted to install its libraries to /nix/store/-libindicator-gtk3-/lib/indicators3/7.

GrahamcOfBorg · 2018-08-15T22:33:33Z

Success on aarch64-linux (full log)

Attempted: indicator-application-gtk3

Partial log (click to expand)

glibPreFixupPhase
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/5ryisgplk3rwwzqnsn9fp87pybh8xfr3-indicator-application-gtk3-12.10.1
shrinking /nix/store/5ryisgplk3rwwzqnsn9fp87pybh8xfr3-indicator-application-gtk3-12.10.1/libexec/indicator-application/indicator-application-service
shrinking /nix/store/5ryisgplk3rwwzqnsn9fp87pybh8xfr3-indicator-application-gtk3-12.10.1/lib/libapplication.so
strip is /nix/store/ah0va6j4cnwj9nx4j6rwcfc8nh785jwm-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/5ryisgplk3rwwzqnsn9fp87pybh8xfr3-indicator-application-gtk3-12.10.1/lib  /nix/store/5ryisgplk3rwwzqnsn9fp87pybh8xfr3-indicator-application-gtk3-12.10.1/libexec
patching script interpreter paths in /nix/store/5ryisgplk3rwwzqnsn9fp87pybh8xfr3-indicator-application-gtk3-12.10.1
checking for references to /build in /nix/store/5ryisgplk3rwwzqnsn9fp87pybh8xfr3-indicator-application-gtk3-12.10.1...
/nix/store/5ryisgplk3rwwzqnsn9fp87pybh8xfr3-indicator-application-gtk3-12.10.1

worldofpeace · 2018-08-15T22:52:54Z

That's because it wanted to install there using the libindicators indicatordir.
It shouldn't be a problem and I've done it virtually as before

jtojnar · 2018-08-15T22:57:28Z

Yes, that should probably be fixed to $(out)/lib/indicators3/7/ since this is not a library but more of a plug-in.

Not sure if the indicator library supports loading the indicators from there.

GrahamcOfBorg · 2018-08-15T23:17:31Z

No attempt on x86_64-darwin (full log)

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

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.

timokau · 2018-08-15T23:24:05Z

For what its worth LGTM, but @jtojnar seems more knowledgeable about his than me so I'm not merging.

jtojnar · 2018-08-15T23:25:46Z

pkgs/development/libraries/indicator-application/gtk3.nix

@@ -47,7 +38,16 @@ stdenv.mkDerivation rec {
    "localstatedir=\${TMPDIR}"
  ];

-  meta = {
+  PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "$(out)/lib/systemd/user";
+  PKG_CONFIG_INDICATOR3_0_4_INDICATORDIR = "$(out)/lib";


Needs to be changed to $(out)/lib/indicators3/7/ as per indicator3-0.4.pc file.

worldofpeace · 2018-08-15T23:46:27Z

Ok, great :)

worldofpeace · 2018-08-17T12:19:58Z

@jtojnar All done here I think

GrahamcOfBorg added 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 labels Aug 15, 2018

timokau reviewed Aug 15, 2018

View reviewed changes

jtojnar reviewed Aug 15, 2018

View reviewed changes

worldofpeace force-pushed the indicator-application-12.10.1 branch 2 times, most recently from 335b9fb to 6e7ad95 Compare August 15, 2018 13:37

jtojnar reviewed Aug 15, 2018

View reviewed changes

worldofpeace changed the title ~~indicator-application: 12.10.0 -> 12.10.1~~ indicator-application-gtk3: 12.10.0 -> 12.10.1 Aug 15, 2018

worldofpeace force-pushed the indicator-application-12.10.1 branch from 6e7ad95 to 8ef5a29 Compare August 15, 2018 13:58

timokau approved these changes Aug 15, 2018

View reviewed changes

jtojnar requested changes Aug 15, 2018

View reviewed changes

indicator-application-gtk3: 12.10.0 -> 12.10.1

3a73518

worldofpeace force-pushed the indicator-application-12.10.1 branch from 8ef5a29 to 3a73518 Compare August 15, 2018 23:45

jtojnar merged commit c40af1f into NixOS:master Aug 17, 2018

worldofpeace deleted the indicator-application-12.10.1 branch August 17, 2018 13:07

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

indicator-application-gtk3: 12.10.0 -> 12.10.1 #45052

indicator-application-gtk3: 12.10.0 -> 12.10.1 #45052

worldofpeace commented Aug 15, 2018 •

edited

srhb commented Aug 15, 2018

jtojnar commented Aug 15, 2018

timokau Aug 15, 2018

worldofpeace commented Aug 15, 2018

jtojnar Aug 15, 2018

jtojnar Aug 15, 2018 •

edited

worldofpeace Aug 15, 2018

jtojnar Aug 15, 2018

worldofpeace Aug 15, 2018

jtojnar Aug 15, 2018

worldofpeace Aug 15, 2018

timokau commented Aug 15, 2018

GrahamcOfBorg commented Aug 15, 2018

jtojnar commented Aug 15, 2018

jtojnar commented Aug 15, 2018 •

edited

GrahamcOfBorg commented Aug 15, 2018

worldofpeace commented Aug 15, 2018

jtojnar commented Aug 15, 2018 •

edited

GrahamcOfBorg commented Aug 15, 2018

timokau commented Aug 15, 2018

jtojnar Aug 15, 2018

worldofpeace commented Aug 15, 2018

worldofpeace commented Aug 17, 2018

indicator-application-gtk3: 12.10.0 -> 12.10.1 #45052

indicator-application-gtk3: 12.10.0 -> 12.10.1 #45052

Conversation

worldofpeace commented Aug 15, 2018 • edited

Motivation for this change

Things done

srhb commented Aug 15, 2018

jtojnar commented Aug 15, 2018

Choose a reason for hiding this comment

worldofpeace commented Aug 15, 2018

Choose a reason for hiding this comment

jtojnar Aug 15, 2018 • edited

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

timokau commented Aug 15, 2018

GrahamcOfBorg commented Aug 15, 2018

jtojnar commented Aug 15, 2018

jtojnar commented Aug 15, 2018 • edited

GrahamcOfBorg commented Aug 15, 2018

worldofpeace commented Aug 15, 2018

jtojnar commented Aug 15, 2018 • edited

GrahamcOfBorg commented Aug 15, 2018

timokau commented Aug 15, 2018

Choose a reason for hiding this comment

worldofpeace commented Aug 15, 2018

worldofpeace commented Aug 17, 2018

worldofpeace commented Aug 15, 2018 •

edited

jtojnar Aug 15, 2018 •

edited

jtojnar commented Aug 15, 2018 •

edited

jtojnar commented Aug 15, 2018 •

edited