libgnome-keyring: Unify #321785
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -13,9 +13,23 @@ stdenv.mkDerivation (finalAttrs: { | |||||||
|
|
||||||||
| outputs = [ "out" "dev" ]; | ||||||||
|
|
||||||||
| strictDeps = true; | ||||||||
| propagatedBuildInputs = [ glib gobject-introspection dbus libgcrypt ]; | ||||||||
| nativeBuildInputs = [ pkg-config intltool ]; | ||||||||
|
|
||||||||
| configureFlags = [ | ||||||||
| # not ideal to use -config scripts but it's not possible switch it to pkg-config | ||||||||
| # binaries in dev have a for build shebang | ||||||||
|
Comment on lines
+21
to
+22
There was a problem hiding this comment. I don't understand the end of this sentence, but for sure this word is missing:
Suggested change
There was a problem hiding this comment. Same here, I just cherry-picked @Artturin’s commit and gave up on it. I believe it is supposed to be parsed “binaries in dev have (a (for build) shebang)” |
||||||||
| "LIBGCRYPT_CONFIG=${lib.getExe' (lib.getDev libgcrypt) "libgcrypt-config"}" | ||||||||
| ]; | ||||||||
|
|
||||||||
| postPatch = '' | ||||||||
| # uses pkg-config in some places and uses the correct $PKG_CONFIG in some | ||||||||
| # it's an ancient library so it has very old configure scripts and m4 | ||||||||
| substituteInPlace ./configure \ | ||||||||
| --replace "pkg-config" "$PKG_CONFIG" | ||||||||
| ''; | ||||||||
|
|
||||||||
| passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; | ||||||||
|
|
||||||||
| meta = { | ||||||||
|
|
||||||||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
Maybe we should try to use
autoreconfHook?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 do not want to touch this. It should die already.
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.
Oh I think the 1st commit's title is misleading - you are in fact editing the expression of the attribute
libgnome-keyring, and notlibgnome-keyring3.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.
It is modifying what was
gnome.libgnome-keyring(libgnome-keyring3) at the time of the commit. The package is only renamed later.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 is the comment that confused me BTW - why should it die?
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.
It adds extra maintenance work just to support few apps that could not be bothered to migrate to
libsecretin the 10+ years libgnome-keyring has been deprecated.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 OK so
libgnome-keyringis replaced bylibgnome-keyring3which should really be replaced bylibsecret.Still though, if we don't have that many packages still depending on
libgnome-keyringorlibgnome-keyring3, I'd make the effort to try to addautoreconfHook, but I don't care too much about this old library to insist on that :).