diff options
Diffstat (limited to 'nixpkgs/pkgs/development/compilers/glslang/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/compilers/glslang/default.nix | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/nixpkgs/pkgs/development/compilers/glslang/default.nix b/nixpkgs/pkgs/development/compilers/glslang/default.nix index a53e78103ad5..9753a1077a63 100644 --- a/nixpkgs/pkgs/development/compilers/glslang/default.nix +++ b/nixpkgs/pkgs/development/compilers/glslang/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , bison , cmake , jq @@ -10,24 +9,15 @@ }: stdenv.mkDerivation rec { pname = "glslang"; - version = "12.2.0"; + version = "12.3.1"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; rev = version; - hash = "sha256-2i6DZA42b0s1ul6VDhjPi9lpSYvsRD8r9yiRoRfVoW0="; + hash = "sha256-NP5ph598YSPbpzJJUR2r+EkqFmuItxgvOSDgDaN+Swg="; }; - patches = [ - # Fix build on Darwin - # FIXME: remove for next release - (fetchpatch { - url = "https://github.com/KhronosGroup/glslang/commit/6a7ec4be7b8a22ab16cea0f294b5973dbcdd637a.diff"; - hash = "sha256-O1N62X6LZNRNHHz90TLJDbt6pDr28EI6IKMbMXcKBj8="; - }) - ]; - # These get set at all-packages, keep onto them for child drvs passthru = { spirv-tools = spirv-tools; @@ -48,8 +38,11 @@ stdenv.mkDerivation rec { # Fix the paths in .pc, even though it's unclear if these .pc are really useful. postFixup = '' - substituteInPlace "$out"/lib/pkgconfig/SPIRV-Tools{,-shared}.pc \ + substituteInPlace $out/lib/pkgconfig/*.pc \ --replace '=''${prefix}//' '=/' + + # add a symlink for backwards compatibility + ln -s $out/bin/glslang $out/bin/glslangValidator ''; meta = with lib; { |