Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7833d55a066c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5c66d653a267
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Dec 31, 2017

  1. audacious: 3.8.2 -> 3.9 

    Also fixes compilation with qt 5.10.
    @bkchr
    bkchr committed Dec 31, 2017
    Copy the full SHA
    f51aba5 View commit details

Commits on Jan 1, 2018

  1. Merge pull request #33249 from bkchr/audacious3.9 

    audacious: 3.8.2 -> 3.9
    @Mic92
    Mic92 authored Jan 1, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5c66d65 View commit details
Showing with 18 additions and 7 deletions.
  1. +3 −3 pkgs/applications/audio/audacious/default.nix
  2. +15 −4 pkgs/applications/audio/audacious/qt-5.nix
6 changes: 3 additions & 3 deletions pkgs/applications/audio/audacious/default.nix
View file
Original file line number Diff line number Diff line change
@@ -8,16 +8,16 @@

stdenv.mkDerivation rec {
name = "audacious-${version}";
version = "3.8.2";
version = "3.9";

src = fetchurl {
url = "http://distfiles.audacious-media-player.org/audacious-${version}-gtk3.tar.bz2";
sha256 = "1g08xprc9q0lyw3knq723j7xr7i15f8v1x1j3k5wvi8jv21bvijf";
sha256 = "0dc7fg0v2l2j4h9cz1baz7rf4n0a5jgk09qvsj806sh6jp7w6ipm";
};

pluginsSrc = fetchurl {
url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}-gtk3.tar.bz2";
sha256 = "1vqcxwqinlwb2l0kkrarg33sw1brjzrnq5jbhzrql6z6x95h4jbq";
sha256 = "1gck37c5pnzxdhrnb1g75b5hi31s2dc952wifxns45pkdlayrmra";
};

nativeBuildInputs = [
19 changes: 15 additions & 4 deletions pkgs/applications/audio/audacious/qt-5.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
mkDerivation, lib, fetchurl,
mkDerivation, lib, fetchurl, fetchpatch,
gettext, pkgconfig,
qtbase,
alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk_pixbuf, lame, libbs2b,
@@ -10,18 +10,23 @@
}:

let
version = "3.8.2";
version = "3.9";
sources = {
"audacious-${version}" = fetchurl {
url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2";
sha256 = "14xyvmxdax0aj1gqcz8z23cjcavsysyh6b3lkiczkv4vrqf4gwdx";
sha256 = "0pmhrhsjhqnrq3zh4rhfys5jas53ph5ijkq010dxg1n779kl901d";
};

"audacious-plugins-${version}" = fetchurl {
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

mkDerivation {
@@ -33,6 +38,8 @@ mkDerivation {

nativeBuildInputs = [ gettext pkgconfig ];

inherit qt510_plugins_patch;

buildInputs = [
# Core dependencies
qtbase
@@ -55,6 +62,10 @@ mkDerivation {
for (( i=0 ; i < ''${#sourceFiles[*]} ; i++ )); do
(
# only patch the plugins
if [ "$i" -eq "1" ]; then
patches=( $qt510_plugins_patch )
fi
src=''${sourceFiles[$i]}
sourceRoot=''${sourceRoots[$i]}
source $stdenv/setup