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.

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

Various elementary necessaries #44471

Merged
merged 5 commits into from Aug 4, 2018

Conversation

worldofpeace
Copy link
Contributor

Motivation for this change

Thin out my branch so I don't have to build this stuff anymore.
They were languishing in there.

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)
  • Fits CONTRIBUTING.md.

cc @jtojnar

maintainers = with maintainers; [ worldofpeace ];
platforms = platforms.unix;
};
}
Copy link
Contributor

Choose a reason for hiding this comment

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

Missing final \n

@@ -1456,6 +1456,10 @@ with pkgs;

parallel-rust = callPackage ../tools/misc/parallel-rust { };

scour = callPackage ../tools/graphics/scour {
inherit (python.pkgs) buildPythonApplication fetchPypi six;
Copy link
Contributor

Choose a reason for hiding this comment

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

I would move this inside the package expression, it will make it easier to override python.

Copy link
Contributor

Choose a reason for hiding this comment

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

Why use python instead of python3?

, gtk3, intltool, gnome-common, python3, icu }:

stdenv.mkDerivation rec {
name = "libunity";
Copy link
Contributor Author

Choose a reason for hiding this comment

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

oops

Copy link
Contributor

Choose a reason for hiding this comment

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

good catch

@worldofpeace worldofpeace force-pushed the elementary-requesites branch 2 times, most recently from f28466a to c1d5e4c Compare August 4, 2018 21:45
# required for pkgconfig to detect mutter-clutter
libXtst
libXtst # required for pkgconfig to detect mutter-clutter
clutter
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@jtojnar We're sure this is needed right?

Copy link
Contributor

Choose a reason for hiding this comment

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

Actually, I do not see the clutter requirement. libmutter-2 requires mutter-clutter-2 and x11. mutter-clutter-2 requires mutter-cogl-2 and xtst (among others), but rg clutter $(nix-build -A gnome3.mutter)/lib/pkgconfig/ leaves me empty handed.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I recall that I did this because of something weird with https://github.com/elementary/gala/blob/master/meson.build

I'll drop this from my branch and see what it was exactly.

Copy link
Contributor

Choose a reason for hiding this comment

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

I would try dropping 76fa11b and adding clutter directly to gala. From nix point of view, it should be the same.

Copy link
Contributor

Choose a reason for hiding this comment

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

I think I know what is going on. mutter-clutter does not depend on clutter but depends on much the same things clutter propagates. I would just keep the status quo for now.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ahh that makes sense. But currently this doesn't seem right. Maybe fix it later :)

@worldofpeace
Copy link
Contributor Author

Ok I think this is good now.

@jtojnar
Copy link
Contributor

jtojnar commented Aug 4, 2018

@GrahamcOfBorg build libunity appstream scour

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: scour

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

Partial log (click to expand)

writing top-level names to scour.egg-info/top_level.txt
reading manifest file 'scour.egg-info/SOURCES.txt'
writing manifest file 'scour.egg-info/SOURCES.txt'
running build_ext

----------------------------------------------------------------------
Ran 0 tests in 0.000s

OK
/nix/store/yhn2qm1lgbydnca7d2y4vvnxbgc333w9-scour-0.37

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: libunity, appstream, scour

Partial log (click to expand)

shrinking /nix/store/667p6i12fjj90vfachkzhqh2sp26rynl-appstream-0.12.2/bin/appstreamcli
shrinking /nix/store/667p6i12fjj90vfachkzhqh2sp26rynl-appstream-0.12.2/lib/libappstream.so.0.12.2
gzipping man pages under /nix/store/667p6i12fjj90vfachkzhqh2sp26rynl-appstream-0.12.2/share/man/
strip is /nix/store/1hi76hr87bd1y1q1qjk0lv8nmcjip1c8-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/667p6i12fjj90vfachkzhqh2sp26rynl-appstream-0.12.2/lib  /nix/store/667p6i12fjj90vfachkzhqh2sp26rynl-appstream-0.12.2/bin
patching script interpreter paths in /nix/store/667p6i12fjj90vfachkzhqh2sp26rynl-appstream-0.12.2
checking for references to /build in /nix/store/667p6i12fjj90vfachkzhqh2sp26rynl-appstream-0.12.2...
/nix/store/hgp3whvg1ivqzhisdzf7r62csqzqndv4-libunity-7.1.4
/nix/store/667p6i12fjj90vfachkzhqh2sp26rynl-appstream-0.12.2
/nix/store/kg2rm9dkgmfva0j445zbzsrgibnc9lq5-scour-0.37

@GrahamcOfBorg GrahamcOfBorg removed the 6.topic: GNOME GNOME desktop environment and its underlying platform label Aug 4, 2018
@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: libunity, appstream, scour

Partial log (click to expand)

patching script interpreter paths in /nix/store/3hjvb61pkivxi5nfsx1901ys06ssswyk-libunity-7.1.4
checking for references to /build in /nix/store/3hjvb61pkivxi5nfsx1901ys06ssswyk-libunity-7.1.4...
shrinking RPATHs of ELF executables and libraries in /nix/store/qsd0vnc9zvvrdswmcr2p285786ypkm1z-libunity-7.1.4-dev
strip is /nix/store/zrs21zqcchgyabjf4xfimncdq16njizc-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/qsd0vnc9zvvrdswmcr2p285786ypkm1z-libunity-7.1.4-dev/lib
patching script interpreter paths in /nix/store/qsd0vnc9zvvrdswmcr2p285786ypkm1z-libunity-7.1.4-dev
checking for references to /build in /nix/store/qsd0vnc9zvvrdswmcr2p285786ypkm1z-libunity-7.1.4-dev...
/nix/store/3hjvb61pkivxi5nfsx1901ys06ssswyk-libunity-7.1.4
/nix/store/18dbcd0067k5sgarbqc759pw8r44hdpy-appstream-0.12.2
/nix/store/mhrsa0micm9cpccj67k06ib2bksjhx91-scour-0.37

@jtojnar jtojnar merged commit 544f1d4 into NixOS:master Aug 4, 2018
@worldofpeace worldofpeace deleted the elementary-requesites branch August 4, 2018 22:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants