theotheroracle/ricochet-refresh-nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix tor dependency

Browse source
This commit is contained in:
Bit Borealis 2023-07-27 12:42:52 +00:00
parent e0f6f3260f
commit 48459fc6a8
Signed by: theotheroracle
GPG key ID: 2D816A2DCA6E5649
1 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
default.nix
View file

@ -3,7 +3,6 @@
, lib , lib
, qtbase , qtbase
, qtquickcontrols2 , qtquickcontrols2
, qtdeclarative
, qtmultimedia , qtmultimedia
, qttools , qttools
, cmake , cmake
@ -27,27 +26,25 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
tor
fmt_9 fmt_9
openssl openssl
qtquickcontrols2 qtquickcontrols2
qtmultimedia qtmultimedia
protobuf protobuf
# qtdeclarative
qttools qttools
qtbase qtbase
]; ];
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
qtWrapperArgs = [ "--prefix PATH : ${tor}/bin" ];
cmakeFlags = [ cmakeFlags = [
"-S ../src" "-S ../src"
# "-B ../build"
"-DCMAKE_BUILD_TYPE=MinSizeRel" "-DCMAKE_BUILD_TYPE=MinSizeRel"
"-DRICOCHET_REFRESH_INSTALL_DESKTOP=ON" "-DRICOCHET_REFRESH_INSTALL_DESKTOP=ON"
"-DUSE_SUBMODULE_FMT=OFF" "-DUSE_SUBMODULE_FMT=OFF"
# "-DFORCE_QT5=ON"
# "--debug-find-pkg=Qt6MultimediaQuick"
# "-DQT_DEBUG_FIND_PACKAGE=ON"
]; ];
postUnpack = '' postUnpack = ''
@ -58,16 +55,6 @@ rm -d $TOR_DIR
mv $TOR_SRC $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 = '' postInstall = ''
mv $out/usr/* $out mv $out/usr/* $out
rm -d $out/usr rm -d $out/usr