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
Conversation
376ffc9
to
a5f8ff5
Compare
maintainers = with maintainers; [ worldofpeace ]; | ||
platforms = platforms.unix; | ||
}; | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Missing final \n
pkgs/top-level/all-packages.nix
Outdated
@@ -1456,6 +1456,10 @@ with pkgs; | |||
|
|||
parallel-rust = callPackage ../tools/misc/parallel-rust { }; | |||
|
|||
scour = callPackage ../tools/graphics/scour { | |||
inherit (python.pkgs) buildPythonApplication fetchPypi six; |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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
?
a5f8ff5
to
7fa7634
Compare
, gtk3, intltool, gnome-common, python3, icu }: | ||
|
||
stdenv.mkDerivation rec { | ||
name = "libunity"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oops
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
good catch
f28466a
to
c1d5e4c
Compare
# required for pkgconfig to detect mutter-clutter | ||
libXtst | ||
libXtst # required for pkgconfig to detect mutter-clutter | ||
clutter |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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 :)
c1d5e4c
to
5d95f47
Compare
Ok I think this is good now. |
@GrahamcOfBorg build libunity appstream scour |
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)
|
Success on x86_64-linux (full log) Attempted: libunity, appstream, scour Partial log (click to expand)
|
Success on aarch64-linux (full log) Attempted: libunity, appstream, scour Partial log (click to expand)
|
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
sandbox
innix.conf
on non-NixOS)nix-shell -p nox --run "nox-review wip"
./result/bin/
)nix path-info -S
before and after)cc @jtojnar