Merge pull request #310206 from TomaSajt/nekoray

nekoray: enable strictDeps, fix dependency location
2024-05-10 15:04:35 -06:00
parent e94abec7df 51595aee98
commit a7883a69b5
1 changed files with 4 additions and 2 deletions
@@ -84,11 +84,12 @@ stdenv.mkDerivation (finalAttrs: {
    fetchSubmodules = true;
  };

+  strictDeps = true;
+
  nativeBuildInputs = [
    libsForQt5.wrapQtAppsHook
    cmake
    ninja
-    protobuf
    copyDesktopItems
  ];

@@ -96,8 +97,9 @@ stdenv.mkDerivation (finalAttrs: {
    libsForQt5.qtbase
    libsForQt5.qttools
    libsForQt5.qtx11extras
-    zxing-cpp
+    protobuf
    yaml-cpp
+    zxing-cpp
  ];

  # NKR_PACKAGE makes sure the app uses the user's config directory to store it's non-static content