gstreamer: move executables to bin output

Co-Authored-By: Jan Tojnar <jtojnar@gmail.com>

authored by

Arkanoid87
Jan Tojnar
and committed by
Jan Tojnar
cddfdc64 4df31757

+9 -11
+1 -1
pkgs/applications/kde/kamoso.nix
··· 34 34 ]; 35 35 36 36 qtWrapperArgs = [ 37 - "--prefix GST_PLUGIN_PATH : ${lib.makeSearchPath "lib/gstreamer-1.0" gst}" 37 + "--prefix GST_PLUGIN_PATH : ${lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" gst}" 38 38 ]; 39 39 40 40 meta.license = with lib.licenses; [ lgpl21Only gpl3Only ];
+1 -1
pkgs/applications/misc/qt-video-wlr/default.nix
··· 1 1 { stdenv, lib, fetchFromGitHub, pkg-config, meson, ninja, wayland, pixman, cairo, librsvg, wayland-protocols, wlroots, libxkbcommon, gst_all_1, wrapQtAppsHook, qtbase, qtmultimedia }: 2 2 let 3 - gstreamerPath = with gst_all_1; lib.makeSearchPath "lib/gstreamer-1.0" [ 3 + gstreamerPath = with gst_all_1; lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" [ 4 4 gstreamer 5 5 gst-plugins-base 6 6 gst-plugins-good
+1 -1
pkgs/applications/networking/browsers/nyxt/default.nix
··· 27 27 xclip notify-osd enchant 28 28 ] ++ gstBuildInputs; 29 29 30 - GST_PLUGIN_SYSTEM_PATH_1_0 = lib.concatMapStringsSep ":" (p: "${p}/lib/gstreamer-1.0") gstBuildInputs; 30 + GST_PLUGIN_SYSTEM_PATH_1_0 = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" gstBuildInputs; 31 31 32 32 dontWrapGApps = true; 33 33 installPhase = ''
+1 -1
pkgs/development/libraries/grilo-plugins/default.nix
··· 45 45 # * chromaprint (gst-plugins-bad) 46 46 (substituteAll { 47 47 src = ./chromaprint-gst-plugins.patch; 48 - load_plugins = lib.concatMapStrings (plugin: ''gst_registry_scan_path(gst_registry_get(), "${plugin}/lib/gstreamer-1.0");'') (with gst_all_1; [ 48 + load_plugins = lib.concatMapStrings (plugin: ''gst_registry_scan_path(gst_registry_get(), "${lib.getLib plugin}/lib/gstreamer-1.0");'') (with gst_all_1; [ 49 49 gstreamer 50 50 gst-plugins-base 51 51 gst-plugins-bad
+3 -3
pkgs/development/libraries/gstreamer/core/default.nix
··· 24 24 version = "1.18.4"; 25 25 26 26 outputs = [ 27 + "bin" 27 28 "out" 28 29 "dev" 29 30 # "devdoc" # disabled until `hotdoc` is packaged in nixpkgs, see: 30 31 # - https://github.com/NixOS/nixpkgs/pull/98767 31 32 # - https://github.com/NixOS/nixpkgs/issues/98769#issuecomment-702296551 32 33 ]; 33 - outputBin = "dev"; 34 34 35 35 src = fetchurl { 36 36 url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; ··· 92 92 ''; 93 93 94 94 postInstall = '' 95 - for prog in "$dev/bin/"*; do 95 + for prog in "$bin/bin/"*; do 96 96 # We can't use --suffix here due to quoting so we craft the export command by hand 97 97 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")' 98 98 done 99 99 ''; 100 100 101 101 preFixup = '' 102 - moveToOutput "share/bash-completion" "$dev" 102 + moveToOutput "share/bash-completion" "$bin" 103 103 ''; 104 104 105 105 setupHook = ./setup-hook.sh;
+1 -1
pkgs/development/libraries/libextractor/default.nix
··· 34 34 (substituteAll { 35 35 src = ./gst-hardcode-plugins.patch; 36 36 load_gst_plugins = lib.concatMapStrings 37 - (plugin: ''gst_registry_scan_path(gst_registry_get(), "${plugin}/lib/gstreamer-1.0");'') 37 + (plugin: ''gst_registry_scan_path(gst_registry_get(), "${lib.getLib plugin}/lib/gstreamer-1.0");'') 38 38 (gstPlugins gst_all_1); 39 39 }) 40 40 ];
+1 -3
pkgs/tools/networking/gmrender-resurrect/default.nix
··· 4 4 let 5 5 version = "0.0.9"; 6 6 7 - makePluginPath = plugins: builtins.concatStringsSep ":" (map (p: p + "/lib/gstreamer-1.0") plugins); 8 - 9 - pluginPath = makePluginPath [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav ]; 7 + pluginPath = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav ]; 10 8 in 11 9 stdenv.mkDerivation { 12 10 pname = "gmrender-resurrect";