diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:31:50 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:32:25 +0100 |
| commit | b7baf40e099b4215181fe7b0c63083b12ef2c7fb (patch) | |
| tree | a6efabd31d05b6d0a36624729e80377bbbfb0149 /nixpkgs/pkgs/by-name/ed/eduvpn-client/nix-python-prefix.patch | |
| parent | 710028664e26e85cb831a869b3da9f6993902255 (diff) | |
| parent | 0799f514b1cd74878174939df79ac60ca5036673 (diff) | |
| download | nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.gz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.bz2 nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.lz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.xz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.zst nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/by-name/ed/eduvpn-client/nix-python-prefix.patch')
| -rw-r--r-- | nixpkgs/pkgs/by-name/ed/eduvpn-client/nix-python-prefix.patch | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/by-name/ed/eduvpn-client/nix-python-prefix.patch b/nixpkgs/pkgs/by-name/ed/eduvpn-client/nix-python-prefix.patch new file mode 100644 index 000000000000..4d5fc53b0993 --- /dev/null +++ b/nixpkgs/pkgs/by-name/ed/eduvpn-client/nix-python-prefix.patch @@ -0,0 +1,13 @@ +diff --git a/eduvpn/utils.py b/eduvpn/utils.py +index db0bf0c..76fc52a 100644 +--- a/eduvpn/utils.py ++++ b/eduvpn/utils.py +@@ -69,7 +69,7 @@ def get_prefix() -> str: + """ + target = "share/eduvpn/builder/mainwindow.ui" + local = path.dirname(path.dirname(path.abspath(__file__))) +- options = [local, path.expanduser("~/.local"), "/usr/local", prefix] ++ options = ["@out@"] + for option in options: + logger.debug(f"looking for '{target}' in '{option}'") + if path.isfile(path.join(option, target)): |