-
-
Notifications
You must be signed in to change notification settings - Fork 13.8k
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
gsignond: init at 1.0.7 #43133
gsignond: init at 1.0.7 #43133
Conversation
It seems there's also some plugins that I also need that want to be installed at like |
|
||
postPatch = '' | ||
substituteInPlace meson.build \ | ||
--replace "sysconf_dir = '/etc'" "sysconf_dir = 'etc/'" |
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 this will not work, since the path is used in the code to find the configuration (GSIGNOND_SYSCONF_DIR
). You need to patch just this line. Also patch files are better than sed
ing, since it makes sure the replacement still works.
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.
Thought as much and @samueldr did to.
maintainers = with maintainers; [ worldofpeace ]; | ||
platforms = platforms.linux; | ||
}; | ||
} |
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 trailing newline.
''; | ||
|
||
meta = with stdenv.lib; { | ||
description = "a D-Bus service which performs user authentication on behalf of it's clients"; |
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.
probably can drop the initial a, it's → its
|
||
mesonFlags = [ | ||
# Building documentation does not work in sandboxed environments | ||
"-D documentation=false" |
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.
should not have the space.
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, gtk-doc docbook_xsl docbook_xml_dtd_43 docbook_xml_dtd_45
should be enough to build the documentation.
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.
Ah I see, I'll add them.
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.
You will also need to add glibcLocales
to nativeBuildInputs
and LC_ALL = "en_US.UTF-8";
to the attribute to prevent weird encoding error during docs build.
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.
hah I just saw that errors and was going to do exactly that.
meta = with stdenv.lib; { | ||
description = "a D-Bus service which performs user authentication on behalf of it's clients"; | ||
homepage = https://gitlab.com/accounts-sso/gsignond; | ||
license = licenses.lgpl2; |
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.
This should be lgpl21Plus: https://gitlab.com/accounts-sso/gsignond/blob/44e1e3dca19ece7f35ed6ee8c9cfbd7767003dbb/src/daemon/main.c#L13
sha256 = "03a9d92hldav18bhx63kgi88li8fnm56337bjsr7391awq1k9mv7"; | ||
}; | ||
|
||
nativeBuildInputs = [ pkgconfig meson ninja gobjectIntrospection vala_0_34 ]; |
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.
Just vala
works for me.
version = "1.0.7"; | ||
|
||
name = "${pname}-${version}"; | ||
|
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
@@ -0,0 +1,37 @@ | |||
{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, glib, glib-networking, sqlite, gobjectIntrospection, vala }: |
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 This builds with just regular vala.
630ab93
to
5787c7f
Compare
|
||
configureFlags = [ | ||
"--enable-introspection=yes" | ||
"--disable-static" |
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.
Do we need a static library?
c12b504
to
529ddfd
Compare
249c058
to
2d2cc15
Compare
libtool | ||
pkgconfig | ||
vala | ||
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.
You should use either python3
and python3.pkgs
, or python3Packages.python
and python3Packages
. In the worst case, those two variants can point to a different packages.
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.
Also no need to use with
construct for just a single package.
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.
yeah no with.
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'm using python3Packages.python and the same for python3Packages.pygobject3 already.
|
||
LC_ALL = "en_US.UTF-8"; | ||
|
||
# Don't treat trivial warnings as errors resulting in build failure |
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.
Could you also add a link to upstream issue?
preConfigure = "NOCONFIGURE=1 ./autogen.sh"; | ||
|
||
configureFlags = [ | ||
"--enable-introspection=yes" |
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.
No need for yes.
python | ||
]; | ||
|
||
buildInputs = with python3Packages; [ |
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.
no with here either I suppose
@GrahamcOfBorg build gsignond libgsignon-glib |
No attempt on x86_64-darwin (full log) The following builds were skipped because they don't evaluate on x86_64-darwin: gsignond, libgsignon-glib Partial log (click to expand)
|
@xeji I believe this is still WIP, the components do not work together. |
Success on aarch64-linux (full log) Attempted: gsignond, libgsignon-glib Partial log (click to expand)
|
Success on x86_64-linux (full log) Attempted: gsignond, libgsignon-glib Partial log (click to expand)
|
ok, let's wait until @worldofpeace says it's ready. |
This was far off in the corner of my head. Also this concerns me. So this might get stale until I package the plugins and Make it work ™ |
I am talking about |
Lol, these names are just confusing. It's used for nothing so I'll remove it. |
7e69322
to
e7e1ead
Compare
@jtojnar Btw they don't need the sasl plugin but I'm adding it because they're expanding this feature. |
e7e1ead
to
d908d1b
Compare
d908d1b
to
0c35b13
Compare
9cd55b2
to
1380a5c
Compare
@GrahamcOfBorg build gsignond gsignondPlugins.sasl gsignondPlugins.oauth gsignondPlugins.lastfm gsignondPlugins.mail libsignon-glib |
Success on aarch64-linux (full log) Attempted: gsignond, gsignondPlugins.sasl, gsignondPlugins.oauth, gsignondPlugins.lastfm, gsignondPlugins.mail, libsignon-glib Partial log (click to expand)
|
Success on x86_64-linux (full log) Attempted: gsignond, gsignondPlugins.sasl, gsignondPlugins.oauth, gsignondPlugins.lastfm, gsignondPlugins.mail, libsignon-glib Partial log (click to expand)
|
I think this is ready enough I guess 😄 All patches that I could upstream have been merged. |
1380a5c
to
923e2af
Compare
Can this be merged as a precursor to #48637? |
Thanks for all the work. |
No problem. |
Motivation for this change
Needed this for elementary packaging.
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)