From fbc46ae2caf38cb5a94e6040b63822961011997c Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Tue, 28 May 2019 12:09:20 -0400 Subject: [PATCH 1/2] Package the qView image viewer A fast, unobtrusive Qt-based image viewer. --- pkgs/applications/graphics/qview/default.nix | 22 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/applications/graphics/qview/default.nix diff --git a/pkgs/applications/graphics/qview/default.nix b/pkgs/applications/graphics/qview/default.nix new file mode 100644 index 00000000000..7e8ec9a3898 --- /dev/null +++ b/pkgs/applications/graphics/qview/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchFromGitHub, qmake}: +stdenv.mkDerivation rec { + name = "qview-${version}"; + version = "2.0"; + src = fetchFromGitHub { + owner = "jurplel"; + repo = "qView"; + rev = "${version}"; + sha256 = "1s29hz44rb5dwzq8d4i4bfg77dr0v3ywpvidpa6xzg7hnnv3mhi5"; + }; + nativeBuildInputs = [ qmake ]; + patchPhase = '' + sed "s|/usr/|$out/|g" -i qView.pro + ''; + meta = with stdenv.lib; { + description = "Practical and minimal image viewer"; + homepage = https://interversehq.com/qview/; + license = licenses.gpl3; + maintainers = with maintainers; [ acowley ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6dcede063b8..c407c454bd5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5456,6 +5456,8 @@ in quota = if stdenv.isLinux then linuxquota else unixtools.quota; + qview = libsForQt5.callPackage ../applications/graphics/qview {}; + wiggle = callPackage ../development/tools/wiggle { }; radamsa = callPackage ../tools/security/radamsa { }; From 6f07f1598f15169a96dcc0e91ecdb1cb79c13282 Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Tue, 28 May 2019 16:12:38 -0400 Subject: [PATCH 2/2] Address comments by @aanderse --- pkgs/applications/graphics/qview/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/qview/default.nix b/pkgs/applications/graphics/qview/default.nix index 7e8ec9a3898..0595ab2963c 100644 --- a/pkgs/applications/graphics/qview/default.nix +++ b/pkgs/applications/graphics/qview/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchFromGitHub, qmake}: stdenv.mkDerivation rec { - name = "qview-${version}"; + pname = "qview"; version = "2.0"; src = fetchFromGitHub { owner = "jurplel"; repo = "qView"; - rev = "${version}"; + rev = version; sha256 = "1s29hz44rb5dwzq8d4i4bfg77dr0v3ywpvidpa6xzg7hnnv3mhi5"; }; nativeBuildInputs = [ qmake ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { description = "Practical and minimal image viewer"; - homepage = https://interversehq.com/qview/; + homepage = "https://interversehq.com/qview/"; license = licenses.gpl3; maintainers = with maintainers; [ acowley ]; platforms = platforms.all;