diff --git a/pkgs/applications/office/qnotero/default.nix b/pkgs/applications/office/qnotero/default.nix index b317838f6722..769f58785ee5 100644 --- a/pkgs/applications/office/qnotero/default.nix +++ b/pkgs/applications/office/qnotero/default.nix @@ -1,29 +1,31 @@ -{ stdenv, fetchFromGitHub, python3Packages -}: +{ stdenv, fetchFromGitHub, python3Packages, wrapQtAppsHook }: python3Packages.buildPythonPackage rec { - name = "qnotero-${version}"; + pname = "qnotero"; - version = "1.0.0"; + version = "2.1.1"; src = fetchFromGitHub { - owner = "smathot"; - repo = "qnotero"; - rev = "release/${version}"; - name = "qnotero-${version}-src"; - sha256 = "1d5a9k1llzn9q1qv1bfwc7gfflabh4riplz9jj0hf04b279y1bj0"; + owner = "ealbiter"; + repo = pname; + rev = "v${version}"; + sha256 = "16ckcjxa3dgmz1y8gd57q2h84akra3j4bgl4fwv4m05bam3ml1xs"; }; - propagatedBuildInputs = [ python3Packages.pyqt4 ]; + propagatedBuildInputs = [ python3Packages.pyqt5 wrapQtAppsHook ]; patchPhase = '' substituteInPlace ./setup.py \ --replace "/usr/share" "usr/share" - substituteInPlace ./libqnotero/_themes/default.py \ + substituteInPlace ./libqnotero/_themes/light.py \ --replace "/usr/share" "$out/usr/share" ''; + preFixup = '' + wrapQtApp "$out"/bin/qnotero + ''; + meta = { description = "Quick access to Zotero references"; homepage = http://www.cogsci.nl/software/qnotero; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 219b3fec1a58..feaba9296a18 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21040,7 +21040,7 @@ in qmmp = libsForQt5.callPackage ../applications/audio/qmmp { }; - qnotero = callPackage ../applications/office/qnotero { }; + qnotero = libsForQt5.callPackage ../applications/office/qnotero { }; qrcode = callPackage ../tools/graphics/qrcode {};