diff --git a/pkgs/by-name/ya/yacreader/package.nix b/pkgs/by-name/ya/yacreader/package.nix index b678a634fa0d..60f758f726c2 100644 --- a/pkgs/by-name/ya/yacreader/package.nix +++ b/pkgs/by-name/ya/yacreader/package.nix @@ -22,13 +22,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "yacreader"; - version = "10.0.0"; + version = "10.3.1"; src = fetchFromGitHub { owner = "YACReader"; repo = "yacreader"; tag = finalAttrs.version; - hash = "sha256-nJ4S4ej/I+ifDNa3CPpusFpDsEwZwYDt0JLaebptjuU="; + hash = "sha256-ZNS6tRALPDrY322kE4+xXkxuMRV0+Yxw9aZ2RPy5HiU="; }; patches = [ @@ -42,9 +42,14 @@ stdenv.mkDerivation (finalAttrs: { ''; # Pipewire is dlopen'd, so we must tell it where to look - preConfigure = '' - qtWrapperArgs+=("--prefix" "LD_LIBRARY_PATH" ":" "${lib.makeLibraryPath [ pipewire ]}") - ''; + # So is qtwebapp on macOS + preConfigure = + lib.optionalString stdenv.hostPlatform.isLinux '' + qtWrapperArgs+=("--prefix" "LD_LIBRARY_PATH" ":" "${lib.makeLibraryPath [ pipewire ]}") + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + qtWrapperArgs+=("--prefix" "DYLD_LIBRARY_PATH" ":" "${lib.makeLibraryPath [ qtwebapp ]}") + ''; strictDeps = true; __structuredAttrs = true; @@ -52,7 +57,6 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ # force unarr backend on all platforms (lib.cmakeBool "BUILD_SERVER_STANDALONE" onlyServer) - (lib.cmakeFeature "PDF_BACKEND" "poppler") (lib.cmakeFeature "DECOMPRESSION_BACKEND" "unarr") ]; @@ -89,20 +93,17 @@ stdenv.mkDerivation (finalAttrs: { runHook preInstall mkdir -p "$out"/Applications + mkdir -p "$out/Applications/YACReader.app/Contents/MacOS/languages" + mkdir -p "$out/Applications/YACReaderLibrary.app/Contents/MacOS/languages" + mkdir -p "$out/Applications/YACReaderLibraryServer.app/Contents/MacOS/languages" - cp -r YACReader/YACReader.app "$out"/Applications/ - cp -r YACReaderLibrary/YACReaderLibrary.app "$out"/Applications/ - cp -r YACReaderLibraryServer/YACReaderLibraryServer.app "$out"/Applications/ + cp -r bin/YACReader.app "$out"/Applications/ + cp -r bin/YACReaderLibrary.app "$out"/Applications/ + cp -r bin/YACReaderLibraryServer.app "$out"/Applications/ - cp -r release/server "$out"/Applications/YACReaderLibrary.app/Contents/MacOS/ - cp -r release/server "$out"/Applications/YACReaderLibraryServer.app/Contents/MacOS/ - cp -r release/languages "$out"/Applications/YACReader.app/Contents/MacOS/ - cp -r release/languages "$out"/Applications/YACReaderLibrary.app/Contents/MacOS/ - cp -r release/languages "$out"/Applications/YACReaderLibraryServer.app/Contents/MacOS/ - - makeWrapper "$out"/Applications/YACReader.app/Contents/MacOS/YACReader "$out/bin/YACReader" - makeWrapper "$out"/Applications/YACReaderLibrary.app/Contents/MacOS/YACReaderLibrary "$out/bin/YACReaderLibrary" - makeWrapper "$out"/Applications/YACReaderLibraryServer.app/Contents/MacOS/YACReaderLibraryServer "$out/bin/YACReaderLibraryServer" + find . -name "*.qm" ! -name "*_source.qm" -exec cp {} "$out/Applications/YACReader.app/Contents/MacOS/languages/" \; + find . -name "*.qm" ! -name "*_source.qm" -exec cp {} "$out/Applications/YACReaderLibrary.app/Contents/MacOS/languages/" \; + find . -name "*.qm" ! -name "*_source.qm" -exec cp {} "$out/Applications/YACReaderLibraryServer.app/Contents/MacOS/languages/" \; runHook postInstall ''; diff --git a/pkgs/by-name/ya/yacreader/qtwebapp-devendor.patch b/pkgs/by-name/ya/yacreader/qtwebapp-devendor.patch index 0de92f2311ce..7f8dd16eae0b 100644 --- a/pkgs/by-name/ya/yacreader/qtwebapp-devendor.patch +++ b/pkgs/by-name/ya/yacreader/qtwebapp-devendor.patch @@ -12,7 +12,7 @@ index 839072efe4..8b8a2a5dd4 100644 common_all comic_backend db_helper -+ PRIVATE ++ PUBLIC + PkgConfig::QtWebApp ) diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt