Commit e19d87d2 authored by Martino Fontana's avatar Martino Fontana
Browse files

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.
parent 5148520b

pkgs/applications/misc/bottles/fhsenv.nix

+0 −5
Original line number Diff line number Diff line 
{ 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 {