pyrox.dev
Merge pull request #203130 from wegank/aacgain-bump
+29
-52
pkgs/applications/audio/aacgain/default.nix
+29
-52
pkgs/applications/audio/aacgain/default.nix
···
1
-
{ lib, stdenv, fetchFromGitLab, fetchpatch }:
1
+
{ lib
2
+
, stdenv
3
+
, fetchFromGitHub
4
+
, cmake
5
+
, autoconf
6
+
, automake
7
+
, libtool
8
+
, faad2
9
+
, mp4v2
10
+
}:
2
11
3
12
stdenv.mkDerivation rec {
4
13
pname = "aacgain";
5
-
version = "1.9.0";
14
+
version = "2.0.0";
6
15
7
-
src = fetchFromGitLab {
8
-
owner = "mulx";
9
-
repo = "aacgain";
10
-
rev = "7c29dccd878ade1301710959aeebe87a8f0828f5";
11
-
sha256 = "07hl432vsscqg01b6wr99qmsj4gbx0i02x4k565432y6zpfmaxm0";
16
+
src = fetchFromGitHub {
17
+
owner = "dgilman";
18
+
repo = pname;
19
+
rev = version;
20
+
sha256 = "sha256-9Y23Zh7q3oB4ha17Fpm1Hu2+wtQOA1llj6WDUAO2ARU=";
12
21
};
13
22
14
-
hardeningDisable = [ "format" ];
15
-
16
-
# -Wnarrowing is enabled by default in recent GCC versions,
17
-
# causing compilation to fail.
18
-
NIX_CFLAGS_COMPILE = "-Wno-narrowing";
19
-
20
23
postPatch = ''
21
-
(
22
-
cd mp4v2
23
-
patch -p0 < ${fetchpatch {
24
-
name = "fix_missing_ptr_deref.patch";
25
-
url = "https://aur.archlinux.org/cgit/aur.git/plain/fix_missing_ptr_deref.patch?h=aacgain-cvs&id=e1a19c920f57063e64bab75cb0d8624731f6e3d7";
26
-
sha256 = "1cq7r005nvmwdjb25z80grcam7jv6k57jnl2bh349mg3ajmslbq9";
27
-
}}
28
-
)
24
+
cp -R ${faad2.src}/* 3rdparty/faad2
25
+
cp -R ${mp4v2.src}/* 3rdparty/mp4v2
26
+
chmod -R +w 3rdparty
29
27
'';
30
28
31
-
configurePhase = ''
32
-
runHook preConfigure
33
-
cd mp4v2
34
-
./configure
35
-
36
-
cd ../faad2
37
-
./configure
38
-
39
-
cd ..
40
-
./configure
41
-
runHook postConfigure
42
-
'';
43
-
44
-
buildPhase = ''
45
-
runHook preBuild
46
-
cd mp4v2
47
-
make libmp4v2.la
48
-
49
-
cd ../faad2
50
-
make LDFLAGS=-static
51
-
52
-
cd ..
53
-
make
54
-
runHook postBuild
55
-
'';
29
+
nativeBuildInputs = [
30
+
cmake
31
+
autoconf
32
+
automake
33
+
libtool
34
+
];
56
35
57
-
installPhase = ''
58
-
install -D aacgain/aacgain "$out/bin/aacgain"
59
-
'';
36
+
NIX_CFLAGS_COMPILE = "-Wno-error=narrowing";
60
37
61
38
meta = with lib; {
62
39
description = "ReplayGain for AAC files";
63
-
homepage = "https://aacgain.altosdesign.com";
64
-
license = licenses.gpl2;
65
-
platforms = platforms.linux;
40
+
homepage = "https://github.com/dgilman/aacgain";
41
+
license = licenses.gpl2Plus;
42
+
platforms = platforms.unix;
66
43
maintainers = [ maintainers.robbinch ];
67
44
};
68
45
}
+3
-15
pkgs/development/libraries/mp4v2/default.nix
+3
-15
pkgs/development/libraries/mp4v2/default.nix
···
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "mp4v2";
5
-
version = "4.1.3";
5
+
version = "5.0.1";
6
6
7
7
src = fetchFromGitHub {
8
8
# 2020-06-20: THE current upstream, maintained and used in distros fork.
9
9
owner = "TechSmith";
10
10
repo = "mp4v2";
11
11
rev = "Release-ThirdParty-MP4v2-${version}";
12
-
sha256 = "053a0lgy819sbz92cfkq0vmkn2ky39bva554pj4ypky1j6vs04fv";
12
+
sha256 = "sha256-OP+oVTH9pqYfHtYL1Kjrs1qey/J40ijLi5Gu8GJnvSY=";
13
13
};
14
14
15
-
patches = [
16
-
(fetchurl {
17
-
# 2020-06-19: NOTE: # Fix build with C++11
18
-
# Close when https://github.com/TechSmith/mp4v2/pull/36 merged/closed.
19
-
url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/203f5a72bc97ffe089b424c47b07dd9eaea35713/trunk/libmp4v2-c++11.patch";
20
-
sha256 = "0sbn0il7lmk77yrjyb4f0a3z3h8gsmdkscvz5n9hmrrrhrwf672w";
21
-
})
22
-
] ++ lib.optionals stdenv.cc.isClang [
23
-
# unbreak build with Clang≥6 (C++14 by default). Based on https://reviews.freebsd.org/rP458678
24
-
./fix-build-clang.patch
25
-
];
26
-
27
-
NIX_CFLAGS_COMPILE = [ "-Wno-error=narrowing" ];
15
+
NIX_CFLAGS_COMPILE = "-Wno-error=narrowing";
28
16
29
17
# `faac' expects `mp4.h'.
30
18
postInstall = "ln -s mp4v2/mp4v2.h $out/include/mp4.h";