From 94b8710342f7a83739315c6e45be5070a32e6748 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Wed, 25 May 2022 00:20:58 -0700 Subject: [PATCH 1/2] weylus: Add GST plugins to GST_PLUGIN_PATH Redos #145051 after #161052. Co-authored-by: Andy Chun @noneucat --- pkgs/applications/graphics/weylus/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/applications/graphics/weylus/default.nix b/pkgs/applications/graphics/weylus/default.nix index 7965f824125390..a6b104aacf6965 100644 --- a/pkgs/applications/graphics/weylus/default.nix +++ b/pkgs/applications/graphics/weylus/default.nix @@ -2,6 +2,7 @@ , stdenv , rustPlatform , fetchFromGitHub +, makeWrapper , dbus , ffmpeg , x264 @@ -11,6 +12,7 @@ , libdrm , pkg-config , pango +, pipewire , cmake , autoconf , libtool @@ -62,6 +64,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake nodePackages.typescript + makeWrapper ] ++ lib.optionals stdenv.isLinux [ pkg-config autoconf @@ -73,6 +76,15 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--features=ffmpeg-system" ]; cargoTestFlags = [ "--features=ffmpeg-system" ]; + postFixup = let + GST_PLUGIN_PATH = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" [ + gst_all_1.gst-plugins-base + pipewire + ]; + in lib.optionalString stdenv.isLinux '' + wrapProgram $out/bin/weylus --prefix GST_PLUGIN_PATH : ${GST_PLUGIN_PATH} + ''; + postInstall = '' install -vDm755 weylus.desktop $out/share/applications/weylus.desktop ''; From 6771aaec5c21b59975f3e9e707f90706e502e05c Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Wed, 25 May 2022 00:20:59 -0700 Subject: [PATCH 2/2] weylus: 0.11.4 -> unstable-2022-06-07 --- pkgs/applications/graphics/weylus/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/weylus/default.nix b/pkgs/applications/graphics/weylus/default.nix index a6b104aacf6965..1ba7a4dddc996e 100644 --- a/pkgs/applications/graphics/weylus/default.nix +++ b/pkgs/applications/graphics/weylus/default.nix @@ -25,13 +25,13 @@ rustPlatform.buildRustPackage rec { pname = "weylus"; - version = "0.11.4"; + version = "unstable-2022-06-07"; src = fetchFromGitHub { owner = "H-M-H"; repo = pname; - rev = "v${version}"; - sha256 = "0gq2czxvahww97j4i3k18np29zl6wx85f8253wn3ibqrpfnklz6l"; + rev = "b169a6be2bf3e8d105273d92f032cca5438de53a"; + sha256 = "sha256-J9eVFIfmyBviVuT1MYKb5yoacbPqOAT3A8jahWv5qw8="; }; buildInputs = [ @@ -71,7 +71,7 @@ rustPlatform.buildRustPackage rec { libtool ]; - cargoSha256 = "1pigmch0sy9ipsafd83b8q54xwqjxdaif363n1q8n46arq4v81j0"; + cargoSha256 = "sha256-R46RSRdtfqi1PRQ0MaSIIqtj+Pr3yikm6NeMwwu1CSw="; cargoBuildFlags = [ "--features=ffmpeg-system" ]; cargoTestFlags = [ "--features=ffmpeg-system" ];