From 6bd95f2d1d59d4935e050b3361632731dba7b750 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 10 Jan 2021 10:55:02 +0100 Subject: [PATCH] opustags: 1.5.1 -> 1.6.0 --- pkgs/applications/audio/opustags/default.nix | 22 +++++--------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/audio/opustags/default.nix b/pkgs/applications/audio/opustags/default.nix index 4e26c9b7752..83cf44853a5 100644 --- a/pkgs/applications/audio/opustags/default.nix +++ b/pkgs/applications/audio/opustags/default.nix @@ -1,32 +1,20 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, libiconv, libogg +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, libiconv, libogg , ffmpeg, glibcLocales, perl, perlPackages }: stdenv.mkDerivation rec { pname = "opustags"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "fmang"; repo = "opustags"; rev = version; - sha256 = "1dicv4s395b9gb4jpr0rnxdq9azr45pid62q3x08lb7cvyq3yxbh"; + sha256 = "1wsfw713rhi2gg5xc04cx5i31hlw0l3wdflj3r1y8w45bdk6ag1z"; }; - patches = [ - # Fix building on darwin - (fetchpatch { - url = "https://github.com/fmang/opustags/commit/64fc6f8f6d20e034892e89abff0236c85cae98dc.patch"; - sha256 = "1djifzqhf1w51gbpqbndsh3gnl9iizp6hppxx8x2a92i9ns22zpg"; - }) - (fetchpatch { - url = "https://github.com/fmang/opustags/commit/f98208c1a1d10c15f98b127bbfdf88a7b15b08dc.patch"; - sha256 = "1h3v0r336fca0y8zq1vl2wr8gaqs3vvrrckx7pvji4k1jpiqvp38"; - }) - ]; - buildInputs = [ libogg ]; - nativeBuildInputs = [ cmake pkg-config ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; + nativeBuildInputs = [ cmake pkg-config ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; doCheck = true; @@ -38,7 +26,7 @@ stdenv.mkDerivation rec { make check ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/fmang/opustags"; description = "Ogg Opus tags editor"; platforms = platforms.all;