Unverified Commit 6b025a17 authored by Kira Bruneau's avatar Kira Bruneau Committed by GitHub
Browse files

mangohud: fix cross build (#401554)

parents 44e1cb42 a9129be2

pkgs/tools/graphics/mangohud/default.nix

+16 −17
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
  addDriverRunpath,

  appstream,

  glslang,

  mako,

  python3Packages,

  meson,

  ninja,

  pkg-config,
@@ -31,7 +31,7 @@ 
  libXrandr,

  x11Support ? true,

  waylandSupport ? true,

  nvidiaSupport ? true,

  nvidiaSupport ? lib.meta.availableOn stdenv.hostPlatform libXNVCtrl,

  gamescopeSupport ? true,

  mangoappSupport ? gamescopeSupport,

  mangohudctlSupport ? gamescopeSupport,
@@ -173,21 +173,17 @@ stdenv.mkDerivation (finalAttrs: { 
    (lib.mesonBool "mangohudctl" mangohudctlSupport)

  ];



  nativeBuildInputs =

    [

  strictDeps = true;



  nativeBuildInputs = [

    addDriverRunpath

    glslang

      mako

    python3Packages.mako

    meson

    ninja

    pkg-config

    unzip

    ]

    # Only the headers are used from these packages

    # The corresponding libraries are loaded at runtime from the app's runpath

    ++ lib.optional x11Support libX11

    ++ lib.optional waylandSupport wayland

    ++ lib.optional nvidiaSupport libXNVCtrl;

  ];



  buildInputs =

    [
@@ -195,6 +191,9 @@ stdenv.mkDerivation (finalAttrs: { 
      nlohmann_json

      spdlog

    ]

    ++ lib.optional waylandSupport wayland

    ++ lib.optional x11Support libX11

    ++ lib.optional nvidiaSupport libXNVCtrl

    ++ lib.optional (x11Support || waylandSupport) libxkbcommon

    ++ lib.optionals mangoappSupport [

      glew

pkgs/top-level/all-packages.nix

+0 −1
Original line number Diff line number Diff line
@@ -4315,7 +4315,6 @@ with pkgs; 
  mangohud = callPackage ../tools/graphics/mangohud {

    libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;

    mangohud32 = pkgsi686Linux.mangohud;

    inherit (python3Packages) mako;

  };















  marimo = with python3Packages; toPythonApplication marimo;