From 819e05d13d195b9bfcabc9ce7ead11baa7bf90d5 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 18 Mar 2024 12:55:54 +0100 Subject: [PATCH] a52dec: 0.7.4 -> 0.8.0 --- .../a5/a52dec/package.nix} | 28 +++++++++++++------ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 19 insertions(+), 11 deletions(-) rename pkgs/{development/libraries/a52dec/default.nix => by-name/a5/a52dec/package.nix} (57%) diff --git a/pkgs/development/libraries/a52dec/default.nix b/pkgs/by-name/a5/a52dec/package.nix similarity index 57% rename from pkgs/development/libraries/a52dec/default.nix rename to pkgs/by-name/a5/a52dec/package.nix index fdb309c634da..048b96787a79 100644 --- a/pkgs/development/libraries/a52dec/default.nix +++ b/pkgs/by-name/a5/a52dec/package.nix @@ -1,23 +1,31 @@ -{ lib, stdenv, fetchurl }: +{ + lib, + stdenv, + fetchFromGitLab, + autoreconfHook, +}: stdenv.mkDerivation rec { pname = "a52dec"; - version = "0.7.4"; + version = "0.8.0"; - src = fetchurl { - url = "https://liba52.sourceforge.io/files/${pname}-${version}.tar.gz"; - sha256 = "oh1ySrOzkzMwGUNTaH34LEdbXfuZdRPu9MJd5shl7DM="; + src = fetchFromGitLab { + domain = "git.adelielinux.org"; + owner = "community"; + repo = "a52dec"; + rev = "v${version}"; + hash = "sha256-Z4riiwetJkhQYa+AD8qOiwB1+cuLbOyN/g7D8HM8Pkw="; }; + nativeBuildInputs = [ autoreconfHook ]; + configureFlags = [ "--enable-shared" # Define inline as __attribute__ ((__always_inline__)) "ac_cv_c_inline=yes" ]; - makeFlags = [ - "AR=${stdenv.cc.targetPrefix}ar" - ]; + makeFlags = [ "AR=${stdenv.cc.targetPrefix}ar" ]; # fails 1 out of 1 tests with "BAD GLOBAL SYMBOLS" on i686 # which can also be fixed with @@ -28,7 +36,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "ATSC A/52 stream decoder"; homepage = "https://liba52.sourceforge.io/"; - platforms = platforms.unix; license = licenses.gpl2Plus; + maintainers = with maintainers; [ wegank ]; + mainProgram = "a52dec"; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c73738fe4573..8310d2407400 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20212,8 +20212,6 @@ with pkgs; ### DEVELOPMENT / LIBRARIES - a52dec = callPackage ../development/libraries/a52dec { }; - aalib = callPackage ../development/libraries/aalib { }; abseil-cpp_202103 = callPackage ../development/libraries/abseil-cpp/202103.nix {