glslang: 1.3.231.0 -> 1.3.236.0
This commit is contained in:
parent
705ca8e2b2
commit
ca81eb8452
|
@ -10,13 +10,13 @@
|
||||||
}:
|
}:
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "glslang";
|
pname = "glslang";
|
||||||
version = "1.3.231.0";
|
version = "1.3.236.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "KhronosGroup";
|
owner = "KhronosGroup";
|
||||||
repo = "glslang";
|
repo = "glslang";
|
||||||
rev = "sdk-${version}";
|
rev = "sdk-${version}";
|
||||||
hash = "sha256-huPrQr+lPi7QCF8CufAavHEKGDDimGrcskiojhH9QYk=";
|
hash = "sha256-iVcx1j7OMJEU4cPydNwQSFufTUiqq7GKp69Y6pEt7Wc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# These get set at all-packages, keep onto them for child drvs
|
# These get set at all-packages, keep onto them for child drvs
|
||||||
|
@ -28,12 +28,6 @@ stdenv.mkDerivation rec {
|
||||||
nativeBuildInputs = [ cmake python3 bison jq ];
|
nativeBuildInputs = [ cmake python3 bison jq ];
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
# https://github.com/NixOS/nixpkgs/pull/201747
|
|
||||||
(fetchpatch {
|
|
||||||
name = "Fix-locations-of-cmake-files-in-side-compat-shims.patch";
|
|
||||||
url = "https://github.com/KhronosGroup/glslang/commit/88fd417b0bb7d91755961c70e846d274c182f2b0.patch";
|
|
||||||
hash = "sha256-rjeaPX5Ieem6zkICNvPd2SjvvLzG5wBERZfDLZEJsAk=";
|
|
||||||
})
|
|
||||||
(fetchpatch {
|
(fetchpatch {
|
||||||
name = "Use-CMAKE_INSTALL_FULL_LIBDIR-in-compat-cmake-files.patch";
|
name = "Use-CMAKE_INSTALL_FULL_LIBDIR-in-compat-cmake-files.patch";
|
||||||
url = "https://github.com/KhronosGroup/glslang/commit/7627bd89583c5aafb8b38c81c15494019271fabf.patch";
|
url = "https://github.com/KhronosGroup/glslang/commit/7627bd89583c5aafb8b38c81c15494019271fabf.patch";
|
||||||
|
|
Loading…
Reference in a new issue