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

Merge pull request #125895 from arkanoid87/gstreamer_tools_bin

Browse Source 
gstreamer: move executables to bin output
This commit is contained in:
Jan Tojnar 2022-01-09 01:36:55 +01:00 committed by GitHub
commit 8cdc5aee3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/kde/kamoso.nix
View File

@ -34,7 +34,7 @@ mkDerivation {
]; ];
qtWrapperArgs = [ qtWrapperArgs = [
"--prefix GST_PLUGIN_PATH : ${lib.makeSearchPath "lib/gstreamer-1.0" gst}" "--prefix GST_PLUGIN_PATH : ${lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" gst}"
]; ];
meta = { meta = {

2
pkgs/applications/misc/qt-video-wlr/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, pkg-config, meson, ninja, wayland, pixman, cairo, librsvg, wayland-protocols, wlroots, libxkbcommon, gst_all_1, wrapQtAppsHook, qtbase, qtmultimedia }: { stdenv, lib, fetchFromGitHub, pkg-config, meson, ninja, wayland, pixman, cairo, librsvg, wayland-protocols, wlroots, libxkbcommon, gst_all_1, wrapQtAppsHook, qtbase, qtmultimedia }:
let let
gstreamerPath = with gst_all_1; lib.makeSearchPath "lib/gstreamer-1.0" [ gstreamerPath = with gst_all_1; lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" [
gstreamer gstreamer
gst-plugins-base gst-plugins-base
gst-plugins-good gst-plugins-good

2
pkgs/applications/networking/browsers/nyxt/default.nix
View File

@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
xclip notify-osd enchant xclip notify-osd enchant
] ++ gstBuildInputs; ] ++ gstBuildInputs;
GST_PLUGIN_SYSTEM_PATH_1_0 = lib.concatMapStringsSep ":" (p: "${p}/lib/gstreamer-1.0") gstBuildInputs; GST_PLUGIN_SYSTEM_PATH_1_0 = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" gstBuildInputs;
dontWrapGApps = true; dontWrapGApps = true;
installPhase = '' installPhase = ''

2
pkgs/development/libraries/grilo-plugins/default.nix
View File

@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
# * chromaprint (gst-plugins-bad) # * chromaprint (gst-plugins-bad)
(substituteAll { (substituteAll {
src = ./chromaprint-gst-plugins.patch; src = ./chromaprint-gst-plugins.patch;
load_plugins = lib.concatMapStrings (plugin: ''gst_registry_scan_path(gst_registry_get(), "${plugin}/lib/gstreamer-1.0");'') (with gst_all_1; [ load_plugins = lib.concatMapStrings (plugin: ''gst_registry_scan_path(gst_registry_get(), "${lib.getLib plugin}/lib/gstreamer-1.0");'') (with gst_all_1; [
gstreamer gstreamer
gst-plugins-base gst-plugins-base
gst-plugins-bad gst-plugins-bad

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

@ -24,13 +24,13 @@ stdenv.mkDerivation rec {
version = "1.18.4"; version = "1.18.4";
outputs = [ outputs = [
"bin"
"out" "out"
"dev" "dev"
# "devdoc" # disabled until `hotdoc` is packaged in nixpkgs, see: # "devdoc" # disabled until `hotdoc` is packaged in nixpkgs, see:
# - https://github.com/NixOS/nixpkgs/pull/98767 # - https://github.com/NixOS/nixpkgs/pull/98767
# - https://github.com/NixOS/nixpkgs/issues/98769#issuecomment-702296551 # - https://github.com/NixOS/nixpkgs/issues/98769#issuecomment-702296551
]; ];
outputBin = "dev";
src = fetchurl { src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
@ -94,14 +94,14 @@ stdenv.mkDerivation rec {
''; '';
postInstall = '' postInstall = ''
for prog in "$dev/bin/"*; do for prog in "$bin/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_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")' 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
''; '';
preFixup = '' preFixup = ''
moveToOutput "share/bash-completion" "$dev" moveToOutput "share/bash-completion" "$bin"
''; '';
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;

2
pkgs/development/libraries/libextractor/default.nix
View File

@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
(substituteAll { (substituteAll {
src = ./gst-hardcode-plugins.patch; src = ./gst-hardcode-plugins.patch;
load_gst_plugins = lib.concatMapStrings load_gst_plugins = lib.concatMapStrings
(plugin: ''gst_registry_scan_path(gst_registry_get(), "${plugin}/lib/gstreamer-1.0");'') (plugin: ''gst_registry_scan_path(gst_registry_get(), "${lib.getLib plugin}/lib/gstreamer-1.0");'')
(gstPlugins gst_all_1); (gstPlugins gst_all_1);
}) })
]; ];

4
pkgs/tools/networking/gmrender-resurrect/default.nix
View File

@ -4,9 +4,7 @@
let let
version = "0.0.9"; version = "0.0.9";
makePluginPath = plugins: builtins.concatStringsSep ":" (map (p: p + "/lib/gstreamer-1.0") plugins); pluginPath = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav ];
pluginPath = makePluginPath [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav ];
in in
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "gmrender-resurrect"; pname = "gmrender-resurrect";