diff options
author | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
---|---|---|
committer | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
commit | 80d90d9b204f7c17912740f9f414fe5d59f293ba (patch) | |
tree | 5f2065a06e724270610760d59d01c6888b375a46 /infra/libkookie/nixpkgs/pkgs/tools/security/pass/extensions/0001-Fix-installation-with-Nix.patch | |
parent | 3a31a84c7d3e589035ad08499206aac44a81f424 (diff) | |
parent | 83cbad92d73216bb0d9187c56cce0b91f9121d5a (diff) |
Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/tools/security/pass/extensions/0001-Fix-installation-with-Nix.patch')
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/tools/security/pass/extensions/0001-Fix-installation-with-Nix.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/pass/extensions/0001-Fix-installation-with-Nix.patch b/infra/libkookie/nixpkgs/pkgs/tools/security/pass/extensions/0001-Fix-installation-with-Nix.patch new file mode 100644 index 000000000000..55822f170d14 --- /dev/null +++ b/infra/libkookie/nixpkgs/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 + |