Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7bf37e1f8bc9
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fc80dcf617e5
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 8, 2019

  1. shaderc: 2018.0 -> 2019.0

    @Ralith
    Ralith committed Jun 8, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    Doctor-wu Doctor Wu
    GPG key ID: 7D1412F015912FB2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f809b6b View commit details

Commits on Jun 9, 2019

  1. Merge pull request #62881 from Ralith/shaderc 

    shaderc: 2018.0 -> 2019.0
    @marsam
    marsam authored Jun 9, 2019
    Copy the full SHA
    fc80dcf View commit details
Showing with 10 additions and 10 deletions.
  1. +10 −10 pkgs/development/compilers/shaderc/default.nix
20 changes: 10 additions & 10 deletions pkgs/development/compilers/shaderc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, python }:
{ stdenv, fetchFromGitHub, cmake, python3 }:
# Like many google projects, shaderc doesn't gracefully support separately compiled dependencies, so we can't easily use
# the versions of glslang and spirv-tools used by vulkan-loader. Exact revisions are taken from
# https://github.com/google/shaderc/blob/known-good/known_good.json
@@ -8,32 +8,32 @@ let
glslang = fetchFromGitHub {
owner = "KhronosGroup";
repo = "glslang";
rev = "712cd6618df2c77e126d68042ad7a81a69ee4a6f";
sha256 = "0wncdj6q1hn40lc7cnz97mx5qjvb8p13mhxilnncgcmf0crsvblz";
rev = "d3692c701b1265955221aa0d6ebc656bc4442b2a";
sha256 = "11cvwbzlpr4zrcmmyd9h0kbfhmhr6r696ydmn0yp1jrixby4bmji";
};
spirv-tools = fetchFromGitHub {
owner = "KhronosGroup";
repo = "SPIRV-Tools";
rev = "df5bd2d05ac1fd3ec3024439f885ec21cc949b22";
sha256 = "0l8ds4nn2qcfi8535ai8891i3547x35hscs2jxwwq6qjgw1sgkax";
rev = "08cc49ec59c3ff4d6bd4bb4f2097ede35e802158";
sha256 = "1xhgcppx02fp3nr7654mr3qrgy1fxlxdyl87jhmn3k9jf24gmmmz";
};
spirv-headers = fetchFromGitHub {
owner = "KhronosGroup";
repo = "SPIRV-Headers";
rev = "79b6681aadcb53c27d1052e5f8a0e82a981dbf2f";
sha256 = "0flng2rdmc4ndq3j71h6wk1ibcjvhjrg2rzd6rv445vcsf0jh2pj";
rev = "8b911bd2ba37677037b38c9bd286c7c05701bcda";
sha256 = "0qdnj34bkagszyvci6ifpqd7iqvybhmqzvc9lvqnls44qg90aqh2";
};
in stdenv.mkDerivation rec {
name = "shaderc-${version}";
version = "2018.0";
version = "2019.0";

outputs = [ "out" "lib" "bin" "dev" "static" ];

src = fetchFromGitHub {
owner = "google";
repo = "shaderc";
rev = "v${version}";
sha256 = "0qigmj0riw43pgjn5f6kpvk72fajssz1lc2aiqib5qvmj9rqq3hl";
sha256 = "1l5mmyxhzsbp0a6y2d86i8jmf46c6bjgjkdgkr5l8hmhflmm7gi2";
};

patchPhase = ''
@@ -42,7 +42,7 @@ in stdenv.mkDerivation rec {
ln -s ${spirv-headers} third_party/spirv-tools/external/spirv-headers
'';

nativeBuildInputs = [ cmake python ];
nativeBuildInputs = [ cmake python3 ];

postInstall = ''
moveToOutput "lib/*.a" $static