qscreenshot: 1.0 -> unstable-2021-10-18

qt4 -> qt5

ajs124 d5107300 1607621a

+25 -17
+24 -13
pkgs/applications/graphics/qscreenshot/default.nix
··· 1 - { lib, stdenv, fetchurl, dos2unix, which, qt, Carbon }: 2 3 stdenv.mkDerivation rec { 4 pname = "qscreenshot"; 5 - version = "1.0"; 6 7 - src = fetchurl { 8 - url = "mirror://sourceforge/qscreenshot/qscreenshot-${version}-src.tar.gz"; 9 - sha256 = "1spj5fg2l8p5bk81xsv6hqn1kcrdiy54w19jsfb7g5i94vcb1pcx"; 10 }; 11 12 - buildInputs = [ dos2unix which qt ] 13 - ++ lib.optional stdenv.isDarwin Carbon; 14 - 15 - # Remove carriage returns that cause /bin/sh to abort 16 - preConfigure = '' 17 - dos2unix configure 18 - sed -i "s|lrelease-qt4|lrelease|" src/src.pro 19 - ''; 20 21 meta = with lib; { 22 description = "Simple creation and editing of screenshots"; 23 homepage = "https://sourceforge.net/projects/qscreenshot/";
··· 1 + { stdenv 2 + , lib 3 + , fetchgit 4 + , dos2unix 5 + , qtbase 6 + , qttools 7 + , qtx11extras 8 + , wrapQtAppsHook 9 + , cmake }: 10 11 stdenv.mkDerivation rec { 12 pname = "qscreenshot"; 13 + version = "unstable-2021-10-18"; 14 15 + src = fetchgit { 16 + url = "https://git.code.sf.net/p/qscreenshot/code"; 17 + rev = "e340f06ae2f1a92a353eaa68e103d1c840adc12d"; 18 + sha256 = "0mdiwn74vngiyazr3lq72f3jnv5zw8wyd2dw6rik6dbrvfs69jig"; 19 }; 20 21 + preConfigure = "cd qScreenshot"; 22 23 + nativeBuildInputs = [ 24 + cmake 25 + qttools 26 + wrapQtAppsHook 27 + ]; 28 + buildInputs = [ 29 + qtbase 30 + qtx11extras 31 + ]; 32 meta = with lib; { 33 description = "Simple creation and editing of screenshots"; 34 homepage = "https://sourceforge.net/projects/qscreenshot/";
+1 -4
pkgs/top-level/all-packages.nix
··· 35159 35160 qsampler = libsForQt5.callPackage ../applications/audio/qsampler { }; 35161 35162 - qscreenshot = callPackage ../applications/graphics/qscreenshot { 35163 - inherit (darwin.apple_sdk.frameworks) Carbon; 35164 - qt = qt4; 35165 - }; 35166 35167 qsstv = qt5.callPackage ../applications/radio/qsstv { }; 35168
··· 35159 35160 qsampler = libsForQt5.callPackage ../applications/audio/qsampler { }; 35161 35162 + qscreenshot = libsForQt5.callPackage ../applications/graphics/qscreenshot { }; 35163 35164 qsstv = qt5.callPackage ../applications/radio/qsstv { }; 35165