Unverified Commit 31795c57 authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

renderdoc: Fix wayland support (#419973)

parents 7d951db3 752e52a5

pkgs/by-name/re/renderdoc/package.nix

+11 −10
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
  nix-update-script,

  pcre,

  pkg-config,

  python3Packages,

  # python3Packages.shiboken2 is currently broken

  python312Packages,

  qt5,

  stdenv,
@@ -24,9 +24,6 @@ 
}:



let

  pythonPackages' =

    # lib.meta.availableOn does not respect meta.broken?

    if python3Packages.shiboken2.meta.available then python3Packages else python312Packages;

  custom_swig = fetchFromGitHub {

    owner = "baldurk";

    repo = "swig";
@@ -55,9 +52,9 @@ stdenv.mkDerivation (finalAttrs: { 
    [

      libXdmcp

      libpthreadstubs

      pythonPackages'.pyside2

      pythonPackages'.pyside2-tools

      pythonPackages'.shiboken2

      python312Packages.pyside2

      python312Packages.pyside2-tools

      python312Packages.shiboken2

      qt5.qtbase

      qt5.qtsvg

      vulkan-loader
@@ -75,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { 
    makeWrapper

    pcre

    pkg-config

    pythonPackages'.python

    python312Packages.python

    qt5.qtx11extras

    qt5.wrapQtAppsHook

  ];
@@ -86,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { 
    (lib.cmakeFeature "BUILD_VERSION_DIST_VER" finalAttrs.version)

    (lib.cmakeFeature "BUILD_VERSION_DIST_CONTACT" "https://github.com/NixOS/nixpkgs/")

    (lib.cmakeBool "BUILD_VERSION_STABLE" true)

    (lib.cmakeBool "ENABLE_WAYLAND" waylandSupport)

    (lib.cmakeBool "ENABLE_UNSUPPORTED_EXPERIMENTAL_POSSIBLY_BROKEN_WAYLAND" waylandSupport)

  ];



  dontWrapQtApps = true;
@@ -117,6 +114,7 @@ stdenv.mkDerivation (finalAttrs: { 
    in

    ''

      wrapQtApp $out/bin/qrenderdoc \

        --set QT_QPA_PLATFORM "wayland;xcb" \

        --suffix LD_LIBRARY_PATH : "$out/lib:${libPath}"

      wrapProgram $out/bin/renderdoccmd \

        --suffix LD_LIBRARY_PATH : "$out/lib:${libPath}"
@@ -141,7 +139,10 @@ stdenv.mkDerivation (finalAttrs: { 
    '';

    license = lib.licenses.mit;

    mainProgram = "renderdoccmd";

    maintainers = with lib.maintainers; [ pbsds ];

    maintainers = with lib.maintainers; [

      pbsds

      ShyAssassin

    ];

    platforms = lib.intersectLists lib.platforms.linux (lib.platforms.x86_64 ++ lib.platforms.i686);

  };

})