diff options
| author | Atemu <atemu.main@gmail.com> | 2023-09-21 12:26:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-21 12:26:10 +0200 |
| commit | 3fc41eb16be1e6e6c57158d453a566e879a56d1d (patch) | |
| tree | 30e22c3443ed9e545472912cbba7ea5f47205603 | |
| parent | 50491a3493d365abd88ab08124cfc1be9f29ea42 (diff) | |
| parent | dd2277f8b23bae087fbef069b83befd93b2d2df0 (diff) | |
| download | nixpkgs-3fc41eb16be1e6e6c57158d453a566e879a56d1d.tar nixpkgs-3fc41eb16be1e6e6c57158d453a566e879a56d1d.tar.gz nixpkgs-3fc41eb16be1e6e6c57158d453a566e879a56d1d.tar.bz2 nixpkgs-3fc41eb16be1e6e6c57158d453a566e879a56d1d.tar.lz nixpkgs-3fc41eb16be1e6e6c57158d453a566e879a56d1d.tar.xz nixpkgs-3fc41eb16be1e6e6c57158d453a566e879a56d1d.tar.zst nixpkgs-3fc41eb16be1e6e6c57158d453a566e879a56d1d.zip | |
Merge pull request #248898 from SuperSamus/bottles-gstreamer
bottles: fix GStreamer on 32 bit apps
| -rw-r--r-- | pkgs/applications/misc/bottles/fhsenv.nix | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/pkgs/applications/misc/bottles/fhsenv.nix b/pkgs/applications/misc/bottles/fhsenv.nix index 969a2d8178e..fd0d38f6989 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: [ ] }: @@ -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 { |