diff --git a/default.nix b/default.nix index 8ab38ec..1a7a23f 100644 --- a/default.nix +++ b/default.nix @@ -3,7 +3,6 @@ , lib , qtbase , qtquickcontrols2 -, qtdeclarative , qtmultimedia , qttools , cmake @@ -27,27 +26,25 @@ stdenv.mkDerivation rec { }; buildInputs = [ + tor fmt_9 openssl qtquickcontrols2 qtmultimedia protobuf -# qtdeclarative qttools qtbase ]; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; + qtWrapperArgs = [ "--prefix PATH : ${tor}/bin" ]; + cmakeFlags = [ "-S ../src" -# "-B ../build" "-DCMAKE_BUILD_TYPE=MinSizeRel" "-DRICOCHET_REFRESH_INSTALL_DESKTOP=ON" "-DUSE_SUBMODULE_FMT=OFF" -# "-DFORCE_QT5=ON" -# "--debug-find-pkg=Qt6MultimediaQuick" -# "-DQT_DEBUG_FIND_PACKAGE=ON" ]; postUnpack = '' @@ -58,16 +55,6 @@ rm -d $TOR_DIR mv $TOR_SRC $TOR_DIR ''; - preConfigure = '' -export CMAKE_GENERATOR="Unix Makefiles" -export FORCE_QT5=true -''; - -# installPhase = '' -#echo pwd: $(pwd) -#echo out: $out -#''; - postInstall = '' mv $out/usr/* $out rm -d $out/usr