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

Merge pull request #107490 from gebner/gstreamer-wrapper

Browse Source 
treewide: use GST_PLUGIN_SYSTEM_PATH_1_0 instead of GST_PLUGIN_SYSTEM_PATH
This commit is contained in:
Gabriel Ebner 2020-12-24 12:29:43 +01:00 committed by GitHub
commit e8a8d380ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/audio/mopidy/mopidy.nix
View File

@ -38,10 +38,6 @@ pythonPackages.buildPythonApplication rec {
# There are no tests
doCheck = false;
preFixup = ''
gappsWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH")
'';
meta = with stdenv.lib; {
homepage = "https://www.mopidy.com/";
description = ''

2
pkgs/applications/office/libreoffice/default.nix
View File

@ -300,8 +300,6 @@ in (mkDrv rec {
cp -r sysui/desktop/icons "$out/share"
sed -re 's@Icon=libreoffice(dev)?[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop
qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH")
mkdir -p $dev
cp -r include $dev
'' + lib.optionalString kdeIntegration ''

2
pkgs/development/libraries/gstreamer/core/default.nix
View File

@ -94,7 +94,7 @@ stdenv.mkDerivation rec {
postInstall = ''
for prog in "$dev/bin/"*; do
# We can't use --suffix here due to quoting so we craft the export command by hand
wrapProgram "$prog" --run 'export GST_PLUGIN_SYSTEM_PATH=$GST_PLUGIN_SYSTEM_PATH''${GST_PLUGIN_SYSTEM_PATH:+:}$(unset _tmp; for profile in $NIX_PROFILES; do _tmp="$profile/lib/gstreamer-1.0''${_tmp:+:}$_tmp"; done; printf '%s' "$_tmp")'
wrapProgram "$prog" --run 'export GST_PLUGIN_SYSTEM_PATH_1_0=$GST_PLUGIN_SYSTEM_PATH_1_0''${GST_PLUGIN_SYSTEM_PATH_1_0:+:}$(unset _tmp; for profile in $NIX_PROFILES; do _tmp="$profile/lib/gstreamer-1.0''${_tmp:+:}$_tmp"; done; printf '%s' "$_tmp")'
done
'';

2
pkgs/tools/cd-dvd/brasero/default.nix
View File

@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
];
preFixup = ''
gappsWrapperArgs+=(--prefix PATH : "${binpath}" --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH")
gappsWrapperArgs+=(--prefix PATH : "${binpath}")
'';
meta = with stdenv.lib; {