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

various cleanups of meson projects #37613

Merged
merged 6 commits into from Mar 22, 2018
Merged

various cleanups of meson projects #37613

merged 6 commits into from Mar 22, 2018

Conversation

jtojnar
Copy link
Contributor

@jtojnar jtojnar commented Mar 22, 2018

Motivation for this change

PKG_CONFIG_$PACKAGE_$VARIABLE is awesome.

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.

@jtojnar jtojnar changed the title various clean ups of meson projects various cleanups of meson projects Mar 22, 2018
@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin

The following builds were skipped because they don't evaluate on x86_64-darwin: colord, dbus-broker, deja-dup, pipewire

No partial log is available.

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Attempted: colord, dbus-broker, deja-dup, pipewire

Partial log (click to expand)

  File "/nix/store/b8gd0cbvkm59x8flbc53bvsvmskyig5a-python3-3.6.4/lib/python3.6/os.py", line 210, in makedirs
    makedirs(head, mode, exist_ok)
  File "/nix/store/b8gd0cbvkm59x8flbc53bvsvmskyig5a-python3-3.6.4/lib/python3.6/os.py", line 220, in makedirs
    mkdir(name, mode)
PermissionError: [Errno 13] Permission denied: '/1rz4g4znpzjwh1xymhjpm42vipw92pr73vdgl6xs1hycac8kf2n9'
FAILED: meson-install 
/nix/store/b8gd0cbvkm59x8flbc53bvsvmskyig5a-python3-3.6.4/bin/python3.6m /nix/store/n0m1fh2cfp751ifdakwxgl3ngf4cxamm-meson-0.44.0/bin/meson --internal install /tmp/nix-build-deja-dup-36.3.drv-0/deja-dup-36.3/build/meson-private/install.dat
ninja: build stopped: subcommand failed.
builder for ‘/nix/store/p6r3bv27z5y2m5l7q5lq0l17hn35ycq9-deja-dup-36.3.drv’ failed with exit code 1
error: build of ‘/nix/store/1z6xw1nx4pzqhfar399lab93wbydyw3c-dbus-broker-11.drv’, ‘/nix/store/i0d5013vy2ynyzjkc58ryzpyynkwnqvr-pipewire-0.1.9.drv’, ‘/nix/store/p24j628l4vi1cx94sk3j2n5pr7lhin3v-colord-1.4.2.drv’, ‘/nix/store/p6r3bv27z5y2m5l7q5lq0l17hn35ycq9-deja-dup-36.3.drv’ failed

@GrahamcOfBorg GrahamcOfBorg added 6.topic: GNOME GNOME desktop environment and its underlying platform 10.rebuild-darwin: 1-10 and removed 10.rebuild-darwin: 0 labels Mar 22, 2018
@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: gnome3.libgee

The following builds were skipped because they don't evaluate on x86_64-darwin: colord, dbus-broker, deja-dup, pipewire, spice-gtk

Partial log (click to expand)

glibPreFixupPhase
glibPreFixupPhase
post-installation fixup
Patching '/nix/store/hcqz48brgfa91in7hk8a2cj9jhaxfn8a-libgee-0.20.1-dev/lib/pkgconfig/gee-0.8.pc' includedir to output /nix/store/hcqz48brgfa91in7hk8a2cj9jhaxfn8a-libgee-0.20.1-dev
strip is /nix/store/vb6mgjqgd9h11nbv60fvrp1ls9nxck2y-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/89m1iyrjlzqcx1dm69d35nvmdlxrin7j-libgee-0.20.1/lib
patching script interpreter paths in /nix/store/89m1iyrjlzqcx1dm69d35nvmdlxrin7j-libgee-0.20.1
strip is /nix/store/vb6mgjqgd9h11nbv60fvrp1ls9nxck2y-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/hcqz48brgfa91in7hk8a2cj9jhaxfn8a-libgee-0.20.1-dev/lib
patching script interpreter paths in /nix/store/hcqz48brgfa91in7hk8a2cj9jhaxfn8a-libgee-0.20.1-dev

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: colord, dbus-broker, deja-dup, gnome3.libgee, pipewire, spice-gtk

Partial log (click to expand)

strip is /nix/store/fzcs0fn6bb04m82frhlb78nc03ny3w55-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/zj2vh23nwvnwp4nl6p7w5rvmb6cgf7z4-spice-gtk-0.34-dev/lib
patching script interpreter paths in /nix/store/zj2vh23nwvnwp4nl6p7w5rvmb6cgf7z4-spice-gtk-0.34-dev
checking for references to /build in /nix/store/zj2vh23nwvnwp4nl6p7w5rvmb6cgf7z4-spice-gtk-0.34-dev...
/nix/store/hpjdrxh45zk8zmx7n51s64cv76bdbgrj-colord-1.4.2
/nix/store/aww94j34jra4gh8psm0y19n8vhqd5y4f-dbus-broker-11
/nix/store/5rxd6zm4rkvsb19mklnl5djyvgb9sf93-deja-dup-36.3
/nix/store/z2wxycxp8dq6hn7dzp2mrh9n6jpl74j3-libgee-0.20.1
/nix/store/4vpvswhb4d515qfzlc598k0jh3np035f-pipewire-0.1.9
/nix/store/wyfi7zhzm8bfm3iypa5fisjj9gx6p1fb-spice-gtk-0.34

@GrahamcOfBorg GrahamcOfBorg removed the 6.topic: GNOME GNOME desktop environment and its underlying platform label Mar 22, 2018
@dotlambda dotlambda merged commit 80ce338 into NixOS:master Mar 22, 2018
@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: colord, dbus-broker, deja-dup, pipewire

Partial log (click to expand)

cannot build derivation '/nix/store/i25xawb6apdrcgwxhps5caa7vadlhgal-fix-paths.patch.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/pr02r163bw4vq01zpw22fazwgr0yi40k-geoclue-2.4.7.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/3g0m5a1rbg0fm64qfbgql481yng6sb2r-webkitgtk-2.20.0.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/4b8lwi5vxa0sbf7wz946yd1jp3k20lfz-gnome-online-accounts-3.28.0.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/6hkl7q0zhfbw9siql4pdxvbbp59ghjxb-libgdata-0.17.9.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/m6w0xsqcs3g4v0rkjns277l3qpxph7k9-evolution-data-server-3.28.0.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/3zw0pn8qg36cds8lcgslh3z5m96scinj-tracker-miners-2.0.4.drv': 4 dependencies couldn't be built
cannot build derivation '/nix/store/s2rqgiwmv0q2ymv94hsmfccnwwd1f2yx-nautilus-3.28.0.1.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/6mwvywhff8y1cy7qcby5cdfyl1g8nvm8-deja-dup-36.3.drv': 4 dependencies couldn't be built
�[31;1merror:�[0m build of '/nix/store/6mwvywhff8y1cy7qcby5cdfyl1g8nvm8-deja-dup-36.3.drv' failed

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: colord, dbus-broker, deja-dup, gnome3.libgee, pipewire, spice-gtk

Partial log (click to expand)

cannot build derivation '/nix/store/i25xawb6apdrcgwxhps5caa7vadlhgal-fix-paths.patch.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/3vp6yr8pzqqbr9734vqysarrq8wg2jih-libpeas-1.22.0.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/3g0m5a1rbg0fm64qfbgql481yng6sb2r-webkitgtk-2.20.0.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/4b8lwi5vxa0sbf7wz946yd1jp3k20lfz-gnome-online-accounts-3.28.0.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/6hkl7q0zhfbw9siql4pdxvbbp59ghjxb-libgdata-0.17.9.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/m6w0xsqcs3g4v0rkjns277l3qpxph7k9-evolution-data-server-3.28.0.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/3zw0pn8qg36cds8lcgslh3z5m96scinj-tracker-miners-2.0.4.drv': 4 dependencies couldn't be built
cannot build derivation '/nix/store/s2rqgiwmv0q2ymv94hsmfccnwwd1f2yx-nautilus-3.28.0.1.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/6mwvywhff8y1cy7qcby5cdfyl1g8nvm8-deja-dup-36.3.drv': 4 dependencies couldn't be built
�[31;1merror:�[0m build of '/nix/store/6mwvywhff8y1cy7qcby5cdfyl1g8nvm8-deja-dup-36.3.drv' failed

@jtojnar jtojnar deleted the meson-cleanups branch March 22, 2018 11:07
@jtojnar jtojnar mentioned this pull request Mar 23, 2018
Merged
@hedning
Copy link
Contributor

hedning commented Mar 25, 2018

Night Light stopped working.

Looks like the same problem as last time: /etc/dbus-1/system.conf expects some files to be in ${colord}/etc/dbus-1/system.d, which in reality is in ${colord}/share/system.d.

Instead of patching colord I tried a more general solution, adding share/dbus-1/system.d as a dbus include dir:

modified   pkgs/development/libraries/dbus/make-system-conf.xsl
@@ -27,6 +27,7 @@
       <xsl:for-each select="str:tokenize($serviceDirectories)">
         <servicedir><xsl:value-of select="." />/share/dbus-1/system-services</servicedir>
         <includedir><xsl:value-of select="." />/etc/dbus-1/system.d</includedir>
+        <includedir><xsl:value-of select="." />/share/dbus-1/system.d</includedir>
       </xsl:for-each>
     </busconfig>
   </xsl:template>

This worked, and looking at the dbus manual seems correct:

This is intended to allow extension of the system bus by particular packages. For example, if CUPS wants to be able to send out notification of printer queue changes, it could install a file to /usr/share/dbus-1/system.d or /etc/dbus-1/system.d that allowed all apps to receive this message and allowed the printer daemon user to send it.

Not sure if it's the best solution though, as it seems very uncommon to put these conf files in share/....

@jtojnar
Copy link
Contributor Author

jtojnar commented Mar 27, 2018

@hedning I think this is the correct solution. The path is mentioned in the docs so it needs to be supported.

@hedning hedning mentioned this pull request Mar 28, 2018
Merged
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@jtojnar @GrahamcOfBorg @hedning @bjornfor @lmars @wchresta @dotlambda