diff options
| author | Aleksana <me@aleksana.moe> | 2024-04-20 02:58:20 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-20 02:58:20 +0800 |
| commit | 8f6a7995d7799ccf3463d5ba2507e45e86d866e0 (patch) | |
| tree | 401a668b6b21b8a839e1c1b52f67bad8a943caa8 /pkgs/applications/misc | |
| parent | 1efc6c80c8188d744e1d86d90f872a8c046787f9 (diff) | |
| parent | 1b3b204c850211d29d06be0f26c917b74a668ed6 (diff) | |
Merge pull request #304473 from JohnRTitor/trenchbroom
trenchbroom: 2023.1 -> 2024.1
Diffstat (limited to 'pkgs/applications/misc')
| -rw-r--r-- | pkgs/applications/misc/trenchbroom/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/misc/trenchbroom/default.nix b/pkgs/applications/misc/trenchbroom/default.nix index 83db22260d83d..df7cb0a083923 100644 --- a/pkgs/applications/misc/trenchbroom/default.nix +++ b/pkgs/applications/misc/trenchbroom/default.nix @@ -2,19 +2,19 @@ , cmake, ninja, curl, git, pandoc, pkg-config, unzip, zip , libGL, libGLU, freeimage, freetype, assimp , catch2, fmt, glew, miniz, tinyxml-2, xorg -, qtbase, wrapQtAppsHook +, qtbase, qtwayland, wrapQtAppsHook , copyDesktopItems, makeDesktopItem }: stdenv.mkDerivation rec { pname = "TrenchBroom"; - version = "2023.1"; + version = "2024.1"; src = fetchFromGitHub { owner = "TrenchBroom"; repo = "TrenchBroom"; rev = "v${version}"; - sha256 = "sha256-62xcFKSqxPS+J54+kLo/hewM+Wu/rVBGD8oiECDCJpA="; + hash = "sha256-HNK/gLbew7MKN6GVStxDb2tyMgyw2l1+dhPr6fSaZ4A="; fetchSubmodules = true; }; # Manually simulate a vcpkg installation so that it can link the libraries @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja curl git pandoc wrapQtAppsHook copyDesktopItems pkg-config unzip zip ]; buildInputs = [ libGL libGLU xorg.libXxf86vm xorg.libSM - freeimage freetype qtbase catch2 fmt + freeimage freetype qtbase qtwayland catch2 fmt glew miniz tinyxml-2 assimp ]; QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}"; |