mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-26 00:43:20 +00:00
Merge pull request #77425 from emmanuelrosa/qutebrowser-1.9
qutebrowser: 1.8.3 -> 1.9.0
This commit is contained in:
commit
0c26ef9e76
@ -21,12 +21,12 @@ let
|
||||
|
||||
in mkDerivationWith python3Packages.buildPythonApplication rec {
|
||||
pname = "qutebrowser";
|
||||
version = "1.8.3";
|
||||
version = "1.9.0";
|
||||
|
||||
# the release tarballs are different from the git checkout!
|
||||
src = fetchurl {
|
||||
url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "055zmzk3q0m3hx1742nfy2mdawfllrkvijnbzp1hiv01dj1bxaf8";
|
||||
sha256 = "1y0yq1qfr6g1s7kf3w2crd0b025dv2dfknhlz3v0001ns3rgwj17";
|
||||
};
|
||||
|
||||
# Needs tox
|
||||
|
@ -1,29 +1,20 @@
|
||||
diff --git a/qutebrowser/app.py b/qutebrowser/app.py
|
||||
index 2b6896b76..ee05f379d 100644
|
||||
index a47b5d2f4..f23ee23ef 100644
|
||||
--- a/qutebrowser/app.py
|
||||
+++ b/qutebrowser/app.py
|
||||
@@ -555,22 +555,8 @@ class Quitter:
|
||||
args: The commandline as a list of strings.
|
||||
cwd: The current working directory as a string.
|
||||
@@ -573,13 +573,8 @@ class Quitter(QObject):
|
||||
Return:
|
||||
The commandline as a list of strings.
|
||||
"""
|
||||
- if os.path.basename(sys.argv[0]) == 'qutebrowser':
|
||||
- # Launched via launcher script
|
||||
- args = [sys.argv[0]]
|
||||
- cwd = None
|
||||
- elif hasattr(sys, 'frozen'):
|
||||
- args = [sys.executable]
|
||||
- cwd = os.path.abspath(os.path.dirname(sys.executable))
|
||||
- else:
|
||||
- args = [sys.executable, '-m', 'qutebrowser']
|
||||
- cwd = os.path.join(
|
||||
- os.path.abspath(os.path.dirname(qutebrowser.__file__)), '..')
|
||||
- if not os.path.isdir(cwd):
|
||||
- # Probably running from a python egg. Let's fallback to
|
||||
- # cwd=None and see if that works out.
|
||||
- # See https://github.com/qutebrowser/qutebrowser/issues/323
|
||||
- cwd = None
|
||||
+ args = ['@qutebrowser@']
|
||||
+ cwd = None
|
||||
|
||||
# Add all open pages so they get reopened.
|
||||
page_args = []
|
||||
page_args = [] # type: typing.MutableSequence[str]
|
||||
|
Loading…
Reference in New Issue
Block a user