trenchbroom: 2023.1 -> 2024.1
use hash instead of sha256
This commit is contained in:
parent
b7bf6f716f
commit
1b3b204c85
|
@ -2,19 +2,19 @@
|
||||||
, cmake, ninja, curl, git, pandoc, pkg-config, unzip, zip
|
, cmake, ninja, curl, git, pandoc, pkg-config, unzip, zip
|
||||||
, libGL, libGLU, freeimage, freetype, assimp
|
, libGL, libGLU, freeimage, freetype, assimp
|
||||||
, catch2, fmt, glew, miniz, tinyxml-2, xorg
|
, catch2, fmt, glew, miniz, tinyxml-2, xorg
|
||||||
, qtbase, wrapQtAppsHook
|
, qtbase, qtwayland, wrapQtAppsHook
|
||||||
, copyDesktopItems, makeDesktopItem
|
, copyDesktopItems, makeDesktopItem
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "TrenchBroom";
|
pname = "TrenchBroom";
|
||||||
version = "2023.1";
|
version = "2024.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "TrenchBroom";
|
owner = "TrenchBroom";
|
||||||
repo = "TrenchBroom";
|
repo = "TrenchBroom";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-62xcFKSqxPS+J54+kLo/hewM+Wu/rVBGD8oiECDCJpA=";
|
hash = "sha256-HNK/gLbew7MKN6GVStxDb2tyMgyw2l1+dhPr6fSaZ4A=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
# Manually simulate a vcpkg installation so that it can link the libraries
|
# 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 ];
|
nativeBuildInputs = [ cmake ninja curl git pandoc wrapQtAppsHook copyDesktopItems pkg-config unzip zip ];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
libGL libGLU xorg.libXxf86vm xorg.libSM
|
libGL libGLU xorg.libXxf86vm xorg.libSM
|
||||||
freeimage freetype qtbase catch2 fmt
|
freeimage freetype qtbase qtwayland catch2 fmt
|
||||||
glew miniz tinyxml-2 assimp
|
glew miniz tinyxml-2 assimp
|
||||||
];
|
];
|
||||||
QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}";
|
QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}";
|
||||||
|
|
Loading…
Reference in New Issue
Block a user