diff --git a/pkgs/applications/audio/miniaudicle/default.nix b/pkgs/applications/audio/miniaudicle/default.nix index e469a96ab720..832bd59c4da6 100644 --- a/pkgs/applications/audio/miniaudicle/default.nix +++ b/pkgs/applications/audio/miniaudicle/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchurl +, fetchFromGitHub , bison , flex , which @@ -13,18 +13,22 @@ , audioBackend ? "pulse" # "pulse", "alsa", or "jack" }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "miniaudicle"; - version = "1.3.5.2"; + version = "1.4.2.0"; - src = fetchurl { - url = "https://audicle.cs.princeton.edu/mini/release/files/miniAudicle-${version}.tgz"; - hash = "sha256-dakDz69uHbKZFj8z67CubmRXEQ5X6GuYqlCXXvLzqSI="; + src = fetchFromGitHub { + owner = "ccrma"; + repo = "miniAudicle"; + rev = "miniAudicle-${finalAttrs.version}"; + hash = "sha256-NENpqgCCGiVzVE6rYqBu2RwkzWSiGHe7dZVwBfSomEo="; + fetchSubmodules = true; }; - sourceRoot = "miniAudicle-${version}/src"; + sourceRoot = "source/src"; postPatch = '' + echo '#define GIT_REVISION "${finalAttrs.version}-NixOS"' > git-rev.h substituteInPlace miniAudicle.pro \ --replace "/usr/local" $out ''; @@ -56,4 +60,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; broken = stdenv.isDarwin; # not attempted }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 119a086fc789..176f291a4258 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32715,7 +32715,7 @@ with pkgs; mikmod = callPackage ../applications/audio/mikmod { }; - miniaudicle = callPackage ../applications/audio/miniaudicle { stdenv = gcc10StdenvCompat; }; + miniaudicle = callPackage ../applications/audio/miniaudicle { }; minidsp = callPackage ../applications/audio/minidsp { inherit (darwin.apple_sdk.frameworks) AppKit IOKit;