nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-02 15:41:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #33249 from bkchr/audacious3.9

Browse Source 
audacious: 3.8.2 -> 3.9
This commit is contained in:
Jörg Thalheim 2018-01-01 16:37:36 +01:00 committed by GitHub
commit 5c66d653a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/audio/audacious/default.nix
View File

@ -8,16 +8,16 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "audacious-${version}"; name = "audacious-${version}";
version = "3.8.2"; version = "3.9";
src = fetchurl { src = fetchurl {
url = "http://distfiles.audacious-media-player.org/audacious-${version}-gtk3.tar.bz2"; url = "http://distfiles.audacious-media-player.org/audacious-${version}-gtk3.tar.bz2";
sha256 = "1g08xprc9q0lyw3knq723j7xr7i15f8v1x1j3k5wvi8jv21bvijf"; sha256 = "0dc7fg0v2l2j4h9cz1baz7rf4n0a5jgk09qvsj806sh6jp7w6ipm";
}; };
pluginsSrc = fetchurl { pluginsSrc = fetchurl {
url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}-gtk3.tar.bz2"; url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}-gtk3.tar.bz2";
sha256 = "1vqcxwqinlwb2l0kkrarg33sw1brjzrnq5jbhzrql6z6x95h4jbq"; sha256 = "1gck37c5pnzxdhrnb1g75b5hi31s2dc952wifxns45pkdlayrmra";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

19
pkgs/applications/audio/audacious/qt-5.nix
View File

@ -1,5 +1,5 @@
{ {
mkDerivation, lib, fetchurl, mkDerivation, lib, fetchurl, fetchpatch,
gettext, pkgconfig, gettext, pkgconfig,
qtbase, qtbase,
alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk_pixbuf, lame, libbs2b, alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk_pixbuf, lame, libbs2b,
@ -10,18 +10,23 @@
}: }:
let let
version = "3.8.2"; version = "3.9";
sources = { sources = {
"audacious-${version}" = fetchurl { "audacious-${version}" = fetchurl {
url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2"; url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2";
sha256 = "14xyvmxdax0aj1gqcz8z23cjcavsysyh6b3lkiczkv4vrqf4gwdx"; sha256 = "0pmhrhsjhqnrq3zh4rhfys5jas53ph5ijkq010dxg1n779kl901d";
}; };
"audacious-plugins-${version}" = fetchurl { "audacious-plugins-${version}" = fetchurl {
url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2"; url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2";
sha256 = "1m7xln93zc4qvb1fi83icyd5x2r6azqlvs5nigjz8az3l2kzrknp"; sha256 = "1f17r7ar0mngcf7z41s6xh073vjafw3i7iy9ijb0cd6bi48g5xwb";
}; };
}; };
qt510_plugins_patch = fetchpatch {
url = "https://github.com/audacious-media-player/audacious-plugins/commit/971f7ff7c3d8a0b9b420bf4fd19ab97755607637.patch";
sha256 = "15fy37syj9ygl2ibkkz3g3b9wd22vk9bjfmvqhhkpxphry2zwb17";
};
in in
mkDerivation { mkDerivation {
@ -33,6 +38,8 @@ mkDerivation {
nativeBuildInputs = [ gettext pkgconfig ]; nativeBuildInputs = [ gettext pkgconfig ];
inherit qt510_plugins_patch;
buildInputs = [ buildInputs = [
# Core dependencies # Core dependencies
qtbase qtbase
@ -55,6 +62,10 @@ mkDerivation {
for (( i=0 ; i < ''${#sourceFiles[*]} ; i++ )); do for (( i=0 ; i < ''${#sourceFiles[*]} ; i++ )); do
( (
# only patch the plugins
if [ "$i" -eq "1" ]; then
patches=( $qt510_plugins_patch )
fi
src=''${sourceFiles[$i]} src=''${sourceFiles[$i]}
sourceRoot=''${sourceRoots[$i]} sourceRoot=''${sourceRoots[$i]}
source $stdenv/setup source $stdenv/setup