Merge pull request #208426 from dylhack/patch-1

qFlipper: Add wrapGAppsHook to build inputs
2023-01-14 08:59:37 +04:00
parent 05a63d86da 689aaa51d4
commit 406d96ff15
1 changed files with 4 additions and 1 deletions
@@ -6,6 +6,7 @@
 , libusb1
 , libGL
 , qmake
+, wrapGAppsHook
 , wrapQtAppsHook
 , mkDerivation

@@ -44,6 +45,7 @@ mkDerivation {
    pkg-config
    qmake
    qttools
+    wrapGAppsHook
    wrapQtAppsHook
  ];

@@ -69,6 +71,8 @@ mkDerivation {
    "CONFIG+=qtquickcompiler"
  ];

+  dontWrapGApps = true;
+
  postPatch = ''
    substituteInPlace qflipper_common.pri \
        --replace 'GIT_VERSION = unknown' 'GIT_VERSION = "${version}"' \
@@ -98,5 +102,4 @@ mkDerivation {
    maintainers = with maintainers; [ cab404 ];
    platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; # qtbase doesn't build yet on aarch64-darwin
  };
-
 }