Unverified Commit aa112217 authored by Leiser Fernández Gallo's avatar Leiser Fernández Gallo Committed by GitHub
Browse files

vokoscreen-ng: 3.0.8 -> 3.5.0 (#219070) 



Co-authored-by: default avatarSandro <sandro.jaeckel@gmail.com>
parent aea385d9

pkgs/applications/video/vokoscreen-ng/default.nix

+12 −11
Original line number Diff line number Diff line
@@ -15,28 +15,24 @@ 
, gst-plugins-good

, gst-plugins-bad

, gst-plugins-ugly

, wayland

, wrapQtAppsHook

}:

mkDerivation rec {



mkDerivation rec {

  pname = "vokoscreen-ng";

  version = "3.0.8";

  version = "3.5.0";



  src = fetchFromGitHub {

    owner = "vkohaupt";

    repo = "vokoscreenNG";

    rev = version;

    sha256 = "1302663hyp2xxhaavhfky24a2p9gz23i3rykmrc6c1n23h24snri";

    sha256 = "sha256-4VEIQj9/rSzXM5EQFt2I+cKKOM1URKlblf+6vlWEuO0=";

  };



  patches = [

    # Adaptation of previously used https://github.com/City-busz/vokoscreenNG/commit/0a3784095ecca582f7eb09551ceb34c309d83637 patch

    # 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

    ./linux-support-installation-target.patch

  ];



  qmakeFlags = [ "src/vokoscreenNG.pro" ];



  nativeBuildInputs = [ qttools pkg-config qmake ];

  nativeBuildInputs = [ qttools pkg-config qmake wrapQtAppsHook ];

  buildInputs = [

    gstreamer

    libX11
@@ -44,7 +40,7 @@ mkDerivation rec { 
    qtbase

    qtmultimedia

    qtx11extras



    wayland

    gst-plugins-base

    gst-plugins-good

    gst-plugins-bad
@@ -57,7 +53,12 @@ mkDerivation rec { 
  '';



  postInstall = ''

    mkdir -p $out/bin $out/share/applications $out/share/icons

    cp ./vokoscreenNG $out/bin/

    cp ./src/applications/vokoscreenNG.desktop $out/share/applications/

    cp ./src/applications/vokoscreenNG.png $out/share/icons/

    qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")

    wrapQtApp $out/bin/vokoscreenNG

  '';



  meta = with lib; {

pkgs/applications/video/vokoscreen-ng/linux-support-installation-target.patch

deleted100644 → 0
+0 −40
Original line number Diff line number Diff line 
Seulement dans b: patch.patch

Seulement dans b: ..rej

diff --color -ur a/src/vokoscreenNG.pro b/src/vokoscreenNG.pro

--- a/src/vokoscreenNG.pro	2021-02-03 15:00:57.377401016 +0100

+++ b/src/vokoscreenNG.pro	2021-02-03 15:09:18.141905863 +0100

@@ -160,7 +160,32 @@

 # systrayAlternative

 include(systrayAlternative/systrayAlternative.pri)

 

+unix:!macx {

+  isEmpty(PREFIX) {

+    PREFIX = /usr/local

+  }

+  isEmpty(BINDIR) {

+    BINDIR = $$PREFIX/bin

+  }

+  isEmpty(DATADIR) {

+    DATADIR = $$PREFIX/share

+  }

+

+  target.path = $$BINDIR

+

+  icon.files = applications/vokoscreenNG.png

+  icon.path = $$DATADIR/icons/hicolor/256x256/apps/

+

+  desktop.files = applications/vokoscreenNG.desktop

+  desktop.path = $$DATADIR/applications/

+

+  appdata.files = applications/vokoscreenNG.appdata.xml

+  appdata.path = $$DATADIR/metainfo/

+

+  INSTALLS += target icon desktop appdata

+}

 # ciscoOpenh264

 win32:include(ciscoOpenh264/ciscoOpenh264.pri)

 

-unix:include(wayland/wayland.pri)

\ Pas de fin de ligne à la fin du fichier

+unix:include(wayland/wayland.pri)

+