Unverified Commit f5895218 authored by K900's avatar K900 Committed by GitHub
Browse files

Merge pull request #230375 from lelgenio/fix-steam-beta-gsettings-schemas 

steam: fix missing gsettings-schemas dependency
parents 5d74e13d 42f56362

pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix

+13 −0
Original line number Diff line number Diff line
@@ -76,6 +76,19 @@ let 
    # XDG_DATA_DIRS is used by pressure-vessel (steam proton) and vulkan loaders to find the corresponding icd

    export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}/run/opengl-driver/share:/run/opengl-driver-32/share



    # Following XDG spec [1], XDG_DATA_DIRS should default to "/usr/local/share:/usr/share".

    # In nix, it is commonly set without containing these values, so we add them as fallback.

    #

    # [1] <https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html>

    case ":$XDG_DATA_DIRS:" in

      *:/usr/local/share:*) ;;

      *) export XDG_DATA_DIRS="$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}/usr/local/share" ;;

    esac

    case ":$XDG_DATA_DIRS:" in

      *:/usr/share:*) ;;

      *) export XDG_DATA_DIRS="$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}/usr/share" ;;

    esac



    # Force compilers and other tools to look in default search paths

    unset NIX_ENFORCE_PURITY

    export NIX_CC_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}=1

pkgs/build-support/build-fhsenv-chroot/env.nix

+13 −0
Original line number Diff line number Diff line
@@ -63,6 +63,19 @@ let 
    # XDG_DATA_DIRS is used by pressure-vessel (steam proton) and vulkan loaders to find the corresponding icd

    export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}/run/opengl-driver/share:/run/opengl-driver-32/share



    # Following XDG spec [1], XDG_DATA_DIRS should default to "/usr/local/share:/usr/share".

    # In nix, it is commonly set without containing these values, so we add them as fallback.

    #

    # [1] <https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html>

    case ":$XDG_DATA_DIRS:" in

      *:/usr/local/share:*) ;;

      *) export XDG_DATA_DIRS="$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}/usr/local/share" ;;

    esac

    case ":$XDG_DATA_DIRS:" in

      *:/usr/share:*) ;;

      *) export XDG_DATA_DIRS="$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}/usr/share" ;;

    esac



    # Force compilers and other tools to look in default search paths

    unset NIX_ENFORCE_PURITY

    export NIX_CC_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}=1

pkgs/games/steam/fhsenv.nix

+1 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ in buildFHSEnv rec { 
    SDL2

    libusb1

    dbus-glib

    gsettings-desktop-schemas

    ffmpeg

    libudev0-shim