Unverified Commit 3fc41eb1 authored by Atemu's avatar Atemu Committed by GitHub
Browse files

Merge pull request #248898 from SuperSamus/bottles-gstreamer 

bottles: fix GStreamer on 32 bit apps
parents 50491a34 dd2277f8

pkgs/applications/misc/bottles/fhsenv.nix

+9 −11
Original line number Diff line number Diff line 
{ buildFHSEnv

, symlinkJoin

, bottles-unwrapped

, gst_all_1

, extraPkgs ? pkgs: [ ]

, extraLibraries ? pkgs: [ ]

}:
@@ -37,6 +36,14 @@ let fhsEnv = { 
        libXv

        libXxf86vm

      ];

      gstreamerDeps = pkgs: with pkgs.gst_all_1; [

        gstreamer

        gst-plugins-base

        gst-plugins-good

        gst-plugins-ugly

        gst-plugins-bad

        gst-libav

      ];

    in

    pkgs: with pkgs; [

      # https://wiki.winehq.org/Building_Wine
@@ -49,12 +56,6 @@ let fhsEnv = { 
      gnutls

      libglvnd

      gsm

      gst_all_1.gstreamer

      gst_all_1.gst-plugins-base

      gst_all_1.gst-plugins-good

      gst_all_1.gst-plugins-ugly

      gst_all_1.gst-plugins-bad

      gst_all_1.gst-libav

      libgphoto2

      libjpeg_turbo

      libkrb5
@@ -91,11 +92,8 @@ let fhsEnv = { 
      p11-kit

      zlib # Freetype

    ] ++ xorgDeps pkgs

    ++ gstreamerDeps pkgs

    ++ extraLibraries pkgs;



  profile = ''

    export GST_PLUGIN_PATH=/usr/lib32/gstreamer-1.0:/usr/lib64/gstreamer-1.0

  '';

};

in

symlinkJoin {