From 2a37ccff8817c6ca0695aed8ac19321cf3b7829c Mon Sep 17 00:00:00 2001 From: zendo Date: Wed, 12 Apr 2023 23:59:14 +0800 Subject: [PATCH] gnome-decoder: 0.3.1 -> 0.3.3 --- .../graphics/gnome-decoder/default.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/graphics/gnome-decoder/default.nix b/pkgs/applications/graphics/gnome-decoder/default.nix index 47cd856c79ba..f957a8c291e8 100644 --- a/pkgs/applications/graphics/gnome-decoder/default.nix +++ b/pkgs/applications/graphics/gnome-decoder/default.nix @@ -11,6 +11,7 @@ , libadwaita , zbar , sqlite +, openssl , pipewire , gstreamer , gst-plugins-base @@ -22,20 +23,20 @@ clangStdenv.mkDerivation rec { pname = "gnome-decoder"; - version = "0.3.1"; + version = "0.3.3"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "decoder"; rev = version; - hash = "sha256-WJIOaYSesvLmOzF1Q6o6aLr4KJanXVaNa+r+2LlpKHQ="; + hash = "sha256-eMyPN3UxptqavY9tEATW2AP+kpoWaLwUKCwhNQrarVc="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-RMHVrv/0q42qFUXyd5BSymzx+BxiyqTX0Jzmxnlhyr4="; + hash = "sha256-3j1hoFffQzWBy4IKtmoMkLBJmNbntpyn0sjv1K0MmDo="; }; nativeBuildInputs = [ @@ -57,6 +58,7 @@ clangStdenv.mkDerivation rec { libadwaita zbar sqlite + openssl pipewire gstreamer gst-plugins-base @@ -65,12 +67,6 @@ clangStdenv.mkDerivation rec { LIBCLANG_PATH = "${libclang.lib}/lib"; - # FIXME: workaround for Pipewire 0.3.64 deprecated API change, remove when fixed upstream - # https://gitlab.freedesktop.org/pipewire/pipewire-rs/-/issues/55 - preBuild = '' - export BINDGEN_EXTRA_CLANG_ARGS="$BINDGEN_EXTRA_CLANG_ARGS -DPW_ENABLE_DEPRECATED" - ''; - meta = with lib; { description = "Scan and Generate QR Codes"; homepage = "https://gitlab.gnome.org/World/decoder"; @@ -78,6 +74,5 @@ clangStdenv.mkDerivation rec { platforms = platforms.linux; mainProgram = "decoder"; maintainers = with maintainers; [ zendo ]; - broken = true; }; }