Merge pull request #39974 from Ma27/ssr-qt5

simplescreenrecorder: port to qt5
This commit is contained in:
xeji 2018-05-04 22:54:08 +02:00 committed by GitHub
commit da69dc40f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, alsaLib, ffmpeg, libjack2, libX11, libXext
, libXfixes, libGLU_combined, pkgconfig, libpulseaudio, qt4, cmake, ninja
{ stdenv, fetchurl, alsaLib, ffmpeg, libjack2, libX11, libXext, qtx11extras
, libXfixes, libGLU_combined, pkgconfig, libpulseaudio, qtbase, cmake, ninja
}:
stdenv.mkDerivation rec {
@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "02rl9yyx3hlz9fqvgzv7ipmvx2qahj7ws5wx2m7zs3lssq3qag3g";
};
cmakeFlags = [ "-DWITH_QT5=TRUE" ];
patches = [ ./fix-paths.patch ];
postPatch = ''
@ -24,14 +26,14 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig cmake ninja ];
buildInputs = [
alsaLib ffmpeg libjack2 libX11 libXext libXfixes libGLU_combined
libpulseaudio qt4
libpulseaudio qtbase qtx11extras
];
meta = with stdenv.lib; {
description = "A screen recorder for Linux";
homepage = http://www.maartenbaert.be/simplescreenrecorder;
license = licenses.gpl3;
platforms = platforms.linux;
platforms = [ "x86_64-linux" ];
maintainers = [ maintainers.goibhniu ];
};
}

View File

@ -4877,7 +4877,7 @@ with pkgs;
simpleproxy = callPackage ../tools/networking/simpleproxy { };
simplescreenrecorder = callPackage ../applications/video/simplescreenrecorder { };
simplescreenrecorder = libsForQt5.callPackage ../applications/video/simplescreenrecorder { };
sipsak = callPackage ../tools/networking/sipsak { };