From e19d87d2ec8a6606b3cf2ceaea5553aac4aadc2c Mon Sep 17 00:00:00 2001
From: Martino Fontana <tinozzo123@gmail.com>
Date: Sun, 13 Aug 2023 12:33:44 +0200
Subject: [PATCH] bottles: fix GStreamer on 32 bit apps Because of the
 gst_all_1 input, 64 bit GStreamer was sneaking into the 32 bit libs.

Basically:
```nix
{ buildFHSEnv
, gst_all_1 # Because of this input...
}:
buildFHSEnv {
  multiPkgs = pkgs: with pkgs; {
    # This is both 32 bit and 64 bit
    hello

    # ...this is target arch only (bcause the `with pkgs;` doesn't apply in this case)
    gst_all_1.gst-plugins-base
  };
}
```

This commit removes the `gst_all_1` input to correct that.

Also removes setting `GST_PLUGIN_PATH`, as it doesn't seem necessary anymore.
(That env is the reason why I added the `gst_all_1` input and accidentally causing the issue in the first place. Ugh...)

Closes #207641.
---
 pkgs/applications/misc/bottles/fhsenv.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/applications/misc/bottles/fhsenv.nix b/pkgs/applications/misc/bottles/fhsenv.nix
index 969a2d8178ef..730b65e4c3db 100644
--- a/pkgs/applications/misc/bottles/fhsenv.nix
+++ b/pkgs/applications/misc/bottles/fhsenv.nix
@@ -1,7 +1,6 @@
 { buildFHSEnv
 , symlinkJoin
 , bottles-unwrapped
-, gst_all_1
 , extraPkgs ? pkgs: [ ]
 , extraLibraries ? pkgs: [ ]
 }:
@@ -92,10 +91,6 @@ let fhsEnv = {
       zlib # Freetype
     ] ++ xorgDeps pkgs
     ++ extraLibraries pkgs;
-
-  profile = ''
-    export GST_PLUGIN_PATH=/usr/lib32/gstreamer-1.0:/usr/lib64/gstreamer-1.0
-  '';
 };
 in
 symlinkJoin {