qtpass: 1.2.1 -> 1.2.3

Patch no longer needed (seems to be already applied, and notes mention).
wip/yesman
Will Dietz 5 years ago
parent ec7a34cefe
commit f7d2c23328
  1. 13
      pkgs/applications/misc/qtpass/default.nix
  2. 13
      pkgs/applications/misc/qtpass/hidpi.patch

@ -1,26 +1,21 @@
{ stdenv, fetchFromGitHub, git, gnupg, pass, qtbase, qtsvg, qttools, qmake, makeWrapper }:
stdenv.mkDerivation rec {
name = "qtpass-${version}";
version = "1.2.1";
pname = "qtpass";
version = "1.2.3";
src = fetchFromGitHub {
owner = "IJHack";
repo = "QtPass";
rev = "v${version}";
sha256 = "0pp38b3fifkfwqcb6vi194ccgb8j3zc8j8jq8ww5ib0wvhldzsg8";
sha256 = "1vfhfyccrxq9snyvayqfzm5rqik8ny2gysyv7nipc91kvhq3bhky";
};
patches = [ ./hidpi.patch ];
buildInputs = [ git gnupg pass qtbase qtsvg qttools ];
nativeBuildInputs = [ makeWrapper qmake ];
postPatch = ''
substituteInPlace qtpass.pro --replace "SUBDIRS += src tests main" "SUBDIRS += src main"
substituteInPlace qtpass.pro --replace "main.depends = tests" "main.depends = src"
'';
enableParallelBuilding = true;
postInstall = ''
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…
Cancel
Save