Unverified Commit e497d021 authored by Artturi's avatar Artturi Committed by GitHub
Browse files

Merge pull request #254661 from expipiplus1/swiftshader

swiftshader: 2020-11-06 -> 2023-09-11
parents 05bd27db cf0e893e
Loading
Loading
Loading
Loading
+5 −30
Original line number Diff line number Diff line
@@ -2,22 +2,15 @@

stdenv.mkDerivation rec {
  pname = "swiftshader";
  version = "2020-11-06";
  version = "2023-09-11";

  src = fetchgit {
    url = "https://swiftshader.googlesource.com/SwiftShader";
    rev = "4ed9d3498dcffa987acba1a8007ff8dec336f263";
    sha256 = "1gz2zflfacxf34s78djddf93brn9kyxj4byc4p2ip1pin43lh2lg";
    rev = "4e40d502c440cc59b25fa3a5fee0eadbab7442aa";
    sha256 = "085bdqn80s7zw5h2pz6xff3j34hmkxb9wxzgjmzdr9c24zwp2k1c";
  };

  nativeBuildInputs = [ cmake python3 jq ];
  buildInputs = [ libX11 libXext zlib ];

  env.NIX_CFLAGS_COMPILE = toString [
    # Needed with GCC 12
    "-Wno-error=array-bounds"
    "-Wno-error=uninitialized"
  ];

  # Make sure we include the drivers and icd files in the output as the cmake
  # generated install command only puts in the spirv-tools stuff.
@@ -35,35 +28,17 @@ stdenv.mkDerivation rec {
    mkdir -p "$(dirname "$vk_icd_json")"
    jq ".ICD.library_path = \"$vk_so_path\"" <Linux/vk_swiftshader_icd.json >"$vk_icd_json"

    #
    # GL driver
    #
    gl_so_path="$out/lib/libEGL.so"
    mkdir -p "$(dirname "$gl_so_path")"
    mv Linux/libEGL.so "$gl_so_path"

    gl_icd_json="$out/share/glvnd/egl_vendor.d/swiftshader.json"
    mkdir -p "$(dirname "$gl_icd_json")"
    cat >"$gl_icd_json" <<EOF
    {
      "file_format_version" : "1.0.0",
      "ICD" : {
          "library_path" : "$gl_so_path"
      }
    }
    EOF

    runHook postInstall
  '';

  meta = with lib; {
    description =
      "A high-performance CPU-based implementation of the Vulkan, OpenGL ES, and Direct3D 9 graphics APIs";
      "A high-performance CPU-based implementation of the Vulkan 1.3 graphics API";
    homepage = "https://opensource.google/projects/swiftshader";
    license = licenses.asl20;
    # Should be possible to support Darwin by changing the install phase with
    # 's/Linux/Darwin/' and 's/so/dylib/' or something similar.
    platforms = [ "i686-linux" "x86_64-linux" "armv7l-linux" "mipsel-linux" ];
    platforms = with platforms; linux;
    maintainers = with maintainers; [ expipiplus1 ];
  };
}
+1 −1
Original line number Diff line number Diff line
@@ -20395,7 +20395,7 @@ with pkgs;
  symfony-cli = callPackage ../development/tools/symfony-cli { };
  swiftshader = callPackage ../development/libraries/swiftshader { stdenv = gcc10StdenvCompat; };
  swiftshader = callPackage ../development/libraries/swiftshader { };
  systemfd = callPackage ../development/tools/systemfd { };