From af33ff24a8c2dc1847a3c9657f5d60d13188e699 Mon Sep 17 00:00:00 2001 From: aleksana Date: Fri, 5 Jul 2024 13:22:42 +0800 Subject: [PATCH] soundconverter: 4.0.3 -> 4.0.5 --- .../audio/soundconverter/default.nix | 38 +++++++++++-------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/audio/soundconverter/default.nix b/pkgs/applications/audio/soundconverter/default.nix index e495ef18391f..0c1ac2e2476f 100644 --- a/pkgs/applications/audio/soundconverter/default.nix +++ b/pkgs/applications/audio/soundconverter/default.nix @@ -1,8 +1,8 @@ { lib, - fetchurl, # Optional due to unfree license. faacSupport ? false, + fetchFromGitHub, glib, python3Packages, gtk3, @@ -17,11 +17,13 @@ python3Packages.buildPythonApplication rec { pname = "soundconverter"; - version = "4.0.3"; + version = "4.0.5"; - src = fetchurl { - url = "https://launchpad.net/soundconverter/trunk/${version}/+download/${pname}-${version}.tar.gz"; - sha256 = "sha256-hzIG/4LD3705erPYvXb7uoRwF9LtKKIKB3jrhpYMsZ0="; + src = fetchFromGitHub { + owner = "kassoulet"; + repo = "soundconverter"; + rev = version; + hash = "sha256-sno5EOh8HHfBTIE67VA8mheYp5wUMFRCbcS2EtKES3c="; }; buildInputs = [ @@ -40,11 +42,11 @@ python3Packages.buildPythonApplication rec { gobject-introspection ]; - propagatedBuildInputs = [ - python3Packages.gst-python - python3Packages.distutils-extra - python3Packages.setuptools - python3Packages.pygobject3 + dependencies = with python3Packages; [ + gst-python + distutils-extra + setuptools + pygobject3 ]; nativeCheckInputs = [ xvfb-run ]; @@ -76,7 +78,7 @@ python3Packages.buildPythonApplication rec { sed -i '49 a\ @unittest.skip("Gio.file_parse_name issues")' tests/testcases/names.py '' + lib.optionalString (!faacSupport) '' - substituteInPlace tests/testcases/integration.py --replace \ + substituteInPlace tests/testcases/gui_integration.py --replace \ "for encoder in ['fdkaacenc', 'faac', 'avenc_aac']:" \ "for encoder in ['fdkaacenc', 'avenc_aac']:" ''; @@ -90,7 +92,13 @@ python3Packages.buildPythonApplication rec { # Necessary to set GDK_PIXBUF_MODULE_FILE. strictDeps = false; - meta = with lib; { + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + meta = { homepage = "https://soundconverter.org/"; description = "Leading audio file converter for the GNOME Desktop"; mainProgram = "soundconverter"; @@ -99,8 +107,8 @@ python3Packages.buildPythonApplication rec { and writes WAV, FLAC, MP3, AAC and Ogg Vorbis files. Uses Python and GTK+ GUI toolkit, and runs on X Window System. ''; - license = licenses.gpl3Only; - platforms = platforms.linux; - maintainers = with maintainers; [ jakubgs ]; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ jakubgs ]; }; }