diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2022-01-09 01:36:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-09 01:36:55 +0100 |
| commit | 8cdc5aee3f7e6c8aa6ec811b74cbed313473a184 (patch) | |
| tree | d7e52c07bf5f2c3bd5672e2fb7e156b189a2742a /pkgs/applications | |
| parent | 1fd1c8860fab7873f4148bfd5ee7f8805ee01d1b (diff) | |
| parent | cddfdc642e066624ad6c5a04ed3094bf471ca944 (diff) | |
| download | nixlib-8cdc5aee3f7e6c8aa6ec811b74cbed313473a184.tar nixlib-8cdc5aee3f7e6c8aa6ec811b74cbed313473a184.tar.gz nixlib-8cdc5aee3f7e6c8aa6ec811b74cbed313473a184.tar.bz2 nixlib-8cdc5aee3f7e6c8aa6ec811b74cbed313473a184.tar.lz nixlib-8cdc5aee3f7e6c8aa6ec811b74cbed313473a184.tar.xz nixlib-8cdc5aee3f7e6c8aa6ec811b74cbed313473a184.tar.zst nixlib-8cdc5aee3f7e6c8aa6ec811b74cbed313473a184.zip | |
Merge pull request #125895 from arkanoid87/gstreamer_tools_bin
gstreamer: move executables to bin output
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/kde/kamoso.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/misc/qt-video-wlr/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/nyxt/default.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/kde/kamoso.nix b/pkgs/applications/kde/kamoso.nix index 9baa06275a78..c80ed0c511e4 100644 --- a/pkgs/applications/kde/kamoso.nix +++ b/pkgs/applications/kde/kamoso.nix @@ -34,7 +34,7 @@ mkDerivation { ]; 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 = { diff --git a/pkgs/applications/misc/qt-video-wlr/default.nix b/pkgs/applications/misc/qt-video-wlr/default.nix index bdb434085da0..ffd22be085e1 100644 --- a/pkgs/applications/misc/qt-video-wlr/default.nix +++ b/pkgs/applications/misc/qt-video-wlr/default.nix @@ -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 }: 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 gst-plugins-base gst-plugins-good diff --git a/pkgs/applications/networking/browsers/nyxt/default.nix b/pkgs/applications/networking/browsers/nyxt/default.nix index 59bb2adbf518..ccbc7a8dc8fb 100644 --- a/pkgs/applications/networking/browsers/nyxt/default.nix +++ b/pkgs/applications/networking/browsers/nyxt/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { xclip notify-osd enchant ] ++ 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; installPhase = '' |