qnotero: fix #23438 #23440
Merged
qnotero: fix #23438 #23440
Conversation
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
|
@nico202 Thx for looking at this! If found another way to achieve the intended result, which also reduces the amount of patching necessary: diff --git a/pkgs/applications/office/qnotero/default.nix b/pkgs/applications/office/qnotero/default.nix
index 5076a8f586..7b6bf14681 100644
--- a/pkgs/applications/office/qnotero/default.nix
+++ b/pkgs/applications/office/qnotero/default.nix
@@ -18,17 +18,12 @@ python3Packages.buildPythonPackage rec {
patchPhase = ''
substituteInPlace ./setup.py \
- --replace "/usr/share" "$out/usr/share"
+ --replace "/usr/share" "usr/share"
substituteInPlace ./libqnotero/_themes/default.py \
--replace "/usr/share" "$out/usr/share"
'';
- postInstall = ''
- mkdir -p "$out/usr/share/qnotero"
- mv resources "$out/usr/share/qnotero"
- '';
-
meta = {
description = "Quick access to Zotero references";
homepage = http://www.cogsci.nl/software/qnotero;Perhaps this would be a less-hacky solution to the problem? |
|
Yes please on the patch. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Motivation for this change
#23438
As commented in line 20-21, I could just use "../../../" to fix the path. However I'm not sure if things will keep the way they are, so I thought realpath is less sensible to changes. I have no problem in just replacing it