dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

bottles: fix GStreamer on 32 bit apps

Browse Source 
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.
This commit is contained in:
Martino Fontana 2023-08-13 12:33:44 +02:00
parent 5148520bfa
commit e19d87d2ec
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/misc/bottles/fhsenv.nix
View File

@ -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 {