tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
vokoscreenNG: 3.0.5 -> 3.0.8
SCOTT-HAMILTON
5 years ago
f01474f4
5c7a370a
+47
-8
2 changed files
expand all
collapse all
unified
split
pkgs
applications
video
vokoscreen-ng
default.nix
linux-support-installation-target.patch
+7
-8
pkgs/applications/video/vokoscreen-ng/default.nix
···
1
{ lib
2
, mkDerivation
3
, fetchFromGitHub
4
-
, fetchpatch
5
, pkg-config
6
, qmake
7
, qttools
8
, gstreamer
9
, libX11
0
10
, qtbase
11
, qtmultimedia
12
, qtx11extras
···
19
mkDerivation rec {
20
21
pname = "vokoscreen-ng";
22
-
version = "3.0.5";
23
24
src = fetchFromGitHub {
25
owner = "vkohaupt";
26
repo = "vokoscreenNG";
27
rev = version;
28
-
sha256 = "1spyqw8h8bkc1prdb9aixiw5h3hk3gp2p0nj934bnwq04kmfp660";
29
};
30
31
patches = [
32
-
# Better linux integration
33
-
(fetchpatch {
34
-
url = "https://github.com/vkohaupt/vokoscreenNG/commit/0a3784095ecca582f7eb09551ceb34c309d83637.patch";
35
-
sha256 = "1iibimv8xfxxfk44kkbrkay37ibdndjvs9g53mxr8x8vrsp917bz";
36
-
})
37
];
38
39
qmakeFlags = [ "src/vokoscreenNG.pro" ];
···
42
buildInputs = [
43
gstreamer
44
libX11
0
45
qtbase
46
qtmultimedia
47
qtx11extras
···
1
{ lib
2
, mkDerivation
3
, fetchFromGitHub
0
4
, pkg-config
5
, qmake
6
, qttools
7
, gstreamer
8
, libX11
9
+
, pulseaudio
10
, qtbase
11
, qtmultimedia
12
, qtx11extras
···
19
mkDerivation rec {
20
21
pname = "vokoscreen-ng";
22
+
version = "3.0.8";
23
24
src = fetchFromGitHub {
25
owner = "vkohaupt";
26
repo = "vokoscreenNG";
27
rev = version;
28
+
sha256 = "1302663hyp2xxhaavhfky24a2p9gz23i3rykmrc6c1n23h24snri";
29
};
30
31
patches = [
32
+
# Adaptation of previously used https://github.com/City-busz/vokoscreenNG/commit/0a3784095ecca582f7eb09551ceb34c309d83637 patch
33
+
# used for 3.0.5 but incompatible at least since 3.0.8. The issue is addressed here https://github.com/vkohaupt/vokoscreenNG/issues/139
34
+
./linux-support-installation-target.patch
0
0
35
];
36
37
qmakeFlags = [ "src/vokoscreenNG.pro" ];
···
40
buildInputs = [
41
gstreamer
42
libX11
43
+
pulseaudio
44
qtbase
45
qtmultimedia
46
qtx11extras
+40
pkgs/applications/video/vokoscreen-ng/linux-support-installation-target.patch
···
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
···
1
+
Seulement dans b: patch.patch
2
+
Seulement dans b: ..rej
3
+
diff --color -ur a/src/vokoscreenNG.pro b/src/vokoscreenNG.pro
4
+
--- a/src/vokoscreenNG.pro 2021-02-03 15:00:57.377401016 +0100
5
+
+++ b/src/vokoscreenNG.pro 2021-02-03 15:09:18.141905863 +0100
6
+
@@ -160,7 +160,32 @@
7
+
# systrayAlternative
8
+
include(systrayAlternative/systrayAlternative.pri)
9
+
10
+
+unix:!macx {
11
+
+ isEmpty(PREFIX) {
12
+
+ PREFIX = /usr/local
13
+
+ }
14
+
+ isEmpty(BINDIR) {
15
+
+ BINDIR = $$PREFIX/bin
16
+
+ }
17
+
+ isEmpty(DATADIR) {
18
+
+ DATADIR = $$PREFIX/share
19
+
+ }
20
+
+
21
+
+ target.path = $$BINDIR
22
+
+
23
+
+ icon.files = applications/vokoscreenNG.png
24
+
+ icon.path = $$DATADIR/icons/hicolor/256x256/apps/
25
+
+
26
+
+ desktop.files = applications/vokoscreenNG.desktop
27
+
+ desktop.path = $$DATADIR/applications/
28
+
+
29
+
+ appdata.files = applications/vokoscreenNG.appdata.xml
30
+
+ appdata.path = $$DATADIR/metainfo/
31
+
+
32
+
+ INSTALLS += target icon desktop appdata
33
+
+}
34
+
# ciscoOpenh264
35
+
win32:include(ciscoOpenh264/ciscoOpenh264.pri)
36
+
37
+
-unix:include(wayland/wayland.pri)
38
+
\ Pas de fin de ligne à la fin du fichier
39
+
+unix:include(wayland/wayland.pri)
40
+
+