public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests 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
parent 1bf7a72105 c9161fb11a
commit e8a8d380ec
4 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/audio/mopidy/mopidy.nix
-4
View File
@@ -38,10 +38,6 @@ pythonPackages.buildPythonApplication rec {
# There are no tests # There are no tests
doCheck = false; doCheck = false;
preFixup = ''
gappsWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH")
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "https://www.mopidy.com/"; homepage = "https://www.mopidy.com/";
description = '' description = ''
pkgs/applications/office/libreoffice/default.nix
-2
View File
@@ -300,8 +300,6 @@ in (mkDrv rec {
cp -r sysui/desktop/icons "$out/share" cp -r sysui/desktop/icons "$out/share"
sed -re 's@Icon=libreoffice(dev)?[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop 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 mkdir -p $dev
cp -r include $dev cp -r include $dev
'' + lib.optionalString kdeIntegration '' '' + lib.optionalString kdeIntegration ''
pkgs/development/libraries/gstreamer/core/default.nix
+1 -1
View File
@@ -94,7 +94,7 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
for prog in "$dev/bin/"*; do for prog in "$dev/bin/"*; do
# We can't use --suffix here due to quoting so we craft the export command by hand # 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 done
''; '';
pkgs/tools/cd-dvd/brasero/default.nix
+1 -1
View File
@@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
]; ];
preFixup = '' preFixup = ''
gappsWrapperArgs+=(--prefix PATH : "${binpath}" --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH") gappsWrapperArgs+=(--prefix PATH : "${binpath}")
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {