diff options
| author | Gabriel Ebner <gebner@gebner.org> | 2020-12-23 21:35:19 +0100 |
|---|---|---|
| committer | Gabriel Ebner <gebner@gebner.org> | 2020-12-24 10:34:30 +0100 |
| commit | c9161fb11a99f0cc35ca86cc14f4cc073d683ea5 (patch) | |
| tree | 98b946a128c33298d61736a5d8d356d84c347eaa /pkgs | |
| parent | 9e6737710c4fb2613850e699178b23d54f1a3261 (diff) | |
| download | nixpkgs-c9161fb11a99f0cc35ca86cc14f4cc073d683ea5.tar nixpkgs-c9161fb11a99f0cc35ca86cc14f4cc073d683ea5.tar.gz nixpkgs-c9161fb11a99f0cc35ca86cc14f4cc073d683ea5.tar.bz2 nixpkgs-c9161fb11a99f0cc35ca86cc14f4cc073d683ea5.tar.lz nixpkgs-c9161fb11a99f0cc35ca86cc14f4cc073d683ea5.tar.xz nixpkgs-c9161fb11a99f0cc35ca86cc14f4cc073d683ea5.tar.zst nixpkgs-c9161fb11a99f0cc35ca86cc14f4cc073d683ea5.zip | |
treewide: use GST_PLUGIN_SYSTEM_PATH_1_0 instead of GST_PLUGIN_SYSTEM_PATH
When GST_PLUGIN_SYSTEM_PATH_1_0 is set, gstreamer ignores GST_PLUGIN_SYSTEM_PATH.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/audio/mopidy/mopidy.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/office/libreoffice/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/gstreamer/core/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/cd-dvd/brasero/default.nix | 2 |
4 files changed, 2 insertions, 8 deletions
diff --git a/pkgs/applications/audio/mopidy/mopidy.nix b/pkgs/applications/audio/mopidy/mopidy.nix index eb5672fe135..f2f3734ec2e 100644 --- a/pkgs/applications/audio/mopidy/mopidy.nix +++ b/pkgs/applications/audio/mopidy/mopidy.nix @@ -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 = '' diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index a8c0d4117a3..6d8983179dc 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -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 '' diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 3ea0bd8903a..9c644986eab 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -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 ''; diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix index cdc19887333..c9c71a99deb 100644 --- a/pkgs/tools/cd-dvd/brasero/default.nix +++ b/pkgs/tools/cd-dvd/brasero/default.nix @@ -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; { |