Merge pull request #58075 from dtzWill/update/qtpass-1.2.3
qtpass: 1.2.1 -> 1.2.3
This commit is contained in:
commit
2bc0bf8578
|
@ -1,26 +1,21 @@
|
||||||
{ stdenv, fetchFromGitHub, git, gnupg, pass, qtbase, qtsvg, qttools, qmake, makeWrapper }:
|
{ stdenv, fetchFromGitHub, git, gnupg, pass, qtbase, qtsvg, qttools, qmake, makeWrapper }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "qtpass-${version}";
|
pname = "qtpass";
|
||||||
version = "1.2.1";
|
version = "1.2.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "IJHack";
|
owner = "IJHack";
|
||||||
repo = "QtPass";
|
repo = "QtPass";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "0pp38b3fifkfwqcb6vi194ccgb8j3zc8j8jq8ww5ib0wvhldzsg8";
|
sha256 = "1vfhfyccrxq9snyvayqfzm5rqik8ny2gysyv7nipc91kvhq3bhky";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ ./hidpi.patch ];
|
|
||||||
|
|
||||||
buildInputs = [ git gnupg pass qtbase qtsvg qttools ];
|
buildInputs = [ git gnupg pass qtbase qtsvg qttools ];
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper qmake ];
|
nativeBuildInputs = [ makeWrapper qmake ];
|
||||||
|
|
||||||
postPatch = ''
|
enableParallelBuilding = true;
|
||||||
substituteInPlace qtpass.pro --replace "SUBDIRS += src tests main" "SUBDIRS += src main"
|
|
||||||
substituteInPlace qtpass.pro --replace "main.depends = tests" "main.depends = src"
|
|
||||||
'';
|
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
install -D qtpass.desktop $out/share/applications/qtpass.desktop
|
install -D qtpass.desktop $out/share/applications/qtpass.desktop
|
||||||
|
|
|
@ -1,13 +0,0 @@
|
||||||
diff --git a/main/main.cpp b/main/main.cpp
|
|
||||||
index 8a18409c..1cddd911 100644
|
|
||||||
--- a/main/main.cpp
|
|
||||||
+++ b/main/main.cpp
|
|
||||||
@@ -35,7 +35,7 @@
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
int main(int argc, char *argv[]) {
|
|
||||||
- qputenv("QT_AUTO_SCREEN_SCALE_FACTOR", "1");
|
|
||||||
+ QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
|
|
||||||
QString text = "";
|
|
||||||
for (int i = 1; i < argc; ++i) {
|
|
||||||
if (i > 1)
|
|
Loading…
Reference in New Issue