diff options
author | Maximilian Bosch <maximilian@mbosch.me> | 2020-12-04 22:29:47 +0100 |
---|---|---|
committer | Maximilian Bosch <maximilian@mbosch.me> | 2020-12-04 22:33:53 +0100 |
commit | 2b674912b4d2f3c51046a14cba5e483cbe9dbfd6 (patch) | |
tree | 91af0437eca09e1a2be7dbb7def629ca97f7145d /pkgs/tools/security/pass/extensions/0001-Fix-installation-with-Nix.patch | |
parent | 85d4fa9769c1859f5a9fb7b3c515a3807e4e00d4 (diff) |
passExtensions.pass-import: 2.6 -> 3.1
ChangeLog: https://github.com/roddhjav/pass-import/blob/v3.1/CHANGELOG.rst#31---2020-10-25
* Make sure that all features are enabled by adding `pykeepass`,
`filemagic` etc.
* Patch & use `setup.py` to make sure that everything gets installed
properly into `$out`.
Co-authored-by: elseym <elseym@me.com>
Diffstat (limited to 'pkgs/tools/security/pass/extensions/0001-Fix-installation-with-Nix.patch')
-rw-r--r-- | pkgs/tools/security/pass/extensions/0001-Fix-installation-with-Nix.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/pkgs/tools/security/pass/extensions/0001-Fix-installation-with-Nix.patch b/pkgs/tools/security/pass/extensions/0001-Fix-installation-with-Nix.patch new file mode 100644 index 000000000000..55822f170d14 --- /dev/null +++ b/pkgs/tools/security/pass/extensions/0001-Fix-installation-with-Nix.patch @@ -0,0 +1,41 @@ +From 611cb2de31a460789c44615d3a52b8d24dbd6fdd Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch <maximilian@mbosch.me> +Date: Fri, 4 Dec 2020 21:53:52 +0100 +Subject: [PATCH] Fix installation with Nix + +--- + Makefile | 2 +- + setup.py | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index 2febf4e..8feab91 100644 +--- a/Makefile ++++ b/Makefile +@@ -7,7 +7,7 @@ all: + @echo + + install: +- @python3 setup.py install --root="$(DESTDIR)" --optimize=1 --skip-build ++ @python3 setup.py install --root="$(DESTDIR)" --optimize=1 --skip-build --prefix= + @echo + @echo "pass-import is installed succesfully" + @echo +diff --git a/setup.py b/setup.py +index b30870c..d9fedbc 100644 +--- a/setup.py ++++ b/setup.py +@@ -15,8 +15,8 @@ with Path('pass_import', '__about__.py').open() as file: + with open('README.md') as file: + long_description = file.read() + +-share = Path(sys.prefix, 'share') +-lib = Path('/usr', 'lib', 'password-store', 'extensions') ++share = Path('/share') ++lib = Path('/lib', 'password-store', 'extensions') + if '--user' in sys.argv: + lib = Path.home() / '.password-store' / 'extensions' + if 'XDG_DATA_HOME' in os.environ: +-- +2.28.0 + |