git.iko.soy/typeable/nixpkgs
on master help sign in
qtpass: 1.2.1 -> 1.2.3

Patch no longer needed (seems to be already applied, and notes mention).

commitf7d2c233281819e92c47364afef5728506119371 authorWill Dietz <w@wdtz.org> dateThu 21 Mar 2019, 15:13 (8 years ago) parentec7a34c
2 files changed+4−22
pkgs/applications/misc/qtpass/default.nix+4−9 pkgs/applications/misc/qtpass/hidpi.patch−13
pkgs/applications/misc/qtpass/default.nix+4−9
@@ -1,26 +1,21 @@
11{ stdenv, fetchFromGitHub, git, gnupg, pass, qtbase, qtsvg, qttools, qmake, makeWrapper }:
22
33stdenv.mkDerivation rec {
4− name = "qtpass-${version}";
5− version = "1.2.1";
4+ pname = "qtpass";
5+ version = "1.2.3";
66
77 src = fetchFromGitHub {
88 owner = "IJHack";
99 repo = "QtPass";
1010 rev = "v${version}";
11− sha256 = "0pp38b3fifkfwqcb6vi194ccgb8j3zc8j8jq8ww5ib0wvhldzsg8";
11+ sha256 = "1vfhfyccrxq9snyvayqfzm5rqik8ny2gysyv7nipc91kvhq3bhky";
1212 };
1313
14− patches = [ ./hidpi.patch ];
15−
1614 buildInputs = [ git gnupg pass qtbase qtsvg qttools ];
1715
1816 nativeBuildInputs = [ makeWrapper qmake ];
1917
20− postPatch = ''
21− substituteInPlace qtpass.pro --replace "SUBDIRS += src tests main" "SUBDIRS += src main"
22− substituteInPlace qtpass.pro --replace "main.depends = tests" "main.depends = src"
23− '';
18+ enableParallelBuilding = true;
2419
2520 postInstall = ''
2621 install -D qtpass.desktop $out/share/applications/qtpass.desktop
pkgs/applications/misc/qtpass/hidpi.patchdeleted−13
@@ -1,13 +0,0 @@
1−diff --git a/main/main.cpp b/main/main.cpp
2−index 8a18409c..1cddd911 100644
3−--- a/main/main.cpp
4−+++ b/main/main.cpp
5−@@ -35,7 +35,7 @@
6− * @return
7− */
8− int main(int argc, char *argv[]) {
9−- qputenv("QT_AUTO_SCREEN_SCALE_FACTOR", "1");
10−+ QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
11− QString text = "";
12− for (int i = 1; i < argc; ++i) {
13− if (i > 1)