Merge branch 'staging-next'

2019-09-21 13:14:09 +02:00
parent f0fec244ca 22d7eb74d9
commit 41af38f372
90 changed files with 428 additions and 367 deletions
@@ -8,6 +8,7 @@
 , qtbase
 , qtx11extras
 , wrapQtAppsHook
+, wrapGAppsHook
 , gtk3
 , xmlto
 , docbook_xsl
@@ -36,6 +37,7 @@ stdenv.mkDerivation rec {
    autoreconfHook
    docbook_xsl
    wrapQtAppsHook
+    wrapGAppsHook
  ];

  buildInputs = [
@@ -71,7 +73,7 @@ stdenv.mkDerivation rec {
  dontWrapGApps = true;

  postFixup = lib.optionalString enableVideo ''
-    wrapProgram "$out/bin/zbarcam-gtk" "''${gappsWrapperArgs[@]}"
+    wrapGApp "$out/bin/zbarcam-gtk"
    wrapQtApp "$out/bin/zbarcam-qt"
  '';