diff --git a/pkgs/applications/audio/uade123/default.nix b/pkgs/applications/audio/uade/default.nix similarity index 72% rename from pkgs/applications/audio/uade123/default.nix rename to pkgs/applications/audio/uade/default.nix index 9472ac3ad9ea..8a7a336283cc 100644 --- a/pkgs/applications/audio/uade123/default.nix +++ b/pkgs/applications/audio/uade/default.nix @@ -11,17 +11,19 @@ , lame , flac , vorbis-tools +# https://gitlab.com/uade-music-player/uade/-/issues/38 +, withWriteAudio ? !stdenv.hostPlatform.isDarwin }: stdenv.mkDerivation rec { - pname = "uade123"; - version = "3.01"; + pname = "uade"; + version = "3.02"; src = fetchFromGitLab { owner = "uade-music-player"; repo = "uade"; rev = "uade-${version}"; - sha256 = "0fam3g8mlzrirrac3iwcwsz9jmsqwdy7lkwwdr2q4pkq9cpmh8m5"; + sha256 = "sha256-skPEXBQwyr326zCmZ2jwGxcBoTt3Y/h2hagDeeqbMpw="; }; postPatch = '' @@ -31,12 +33,18 @@ stdenv.mkDerivation rec { substituteInPlace src/frontends/mod2ogg/mod2ogg2.sh.in \ --replace '-e stat' '-n stat' \ --replace '/usr/local' "$out" + substituteInPlace python/uade/generate_oscilloscope_view.py \ + --replace "default='uade123'" "default='$out/bin/uade123'" + # https://gitlab.com/uade-music-player/uade/-/issues/37 + substituteInPlace write_audio/Makefile.in \ + --replace 'g++' '${stdenv.cc.targetPrefix}c++' ''; nativeBuildInputs = [ pkg-config which makeWrapper + ] ++ lib.optionals withWriteAudio [ python3 ]; @@ -47,14 +55,19 @@ stdenv.mkDerivation rec { lame flac vorbis-tools + ] ++ lib.optionals withWriteAudio [ (python3.withPackages (p: with p; [ pillow tqdm + more-itertools ])) ]; configureFlags = [ "--bencode-tools-prefix=${bencodetools}" + "--with-text-scope" + ] ++ lib.optionals (!withWriteAudio) [ + "--without-write-audio" ]; enableParallelBuilding = true; @@ -66,6 +79,7 @@ stdenv.mkDerivation rec { --prefix PATH : $out/bin:${lib.makeBinPath [ sox lame flac vorbis-tools ]} # This is an old script, don't break expectations by renaming it ln -s $out/bin/mod2ogg2{.sh,} + '' + lib.optionalString withWriteAudio '' wrapProgram $out/bin/generate_amiga_oscilloscope_view \ --prefix PYTHONPATH : "$PYTHONPATH:$out/${python3.sitePackages}" ''; @@ -79,6 +93,7 @@ stdenv.mkDerivation rec { # Let's make it easy and flag the whole package as unfree. license = licenses.unfree; maintainers = with maintainers; [ OPNA2608 ]; + mainProgram = "uade123"; platforms = platforms.unix; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 39f8f0b65480..0358d6d80999 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1439,6 +1439,7 @@ mapAliases ({ ### U ### + uade123 = uade; # Added 2022-07-30 uberwriter = apostrophe; # Added 2020-04-23 ubootBeagleboneBlack = ubootAmx335xEVM; # Added 2020-01-21 uchiwa = throw "uchiwa is deprecated and archived by upstream"; # Added 2022-05-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 21a67b858f53..7e905eb55423 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30478,7 +30478,7 @@ with pkgs; inherit (gnome) zenity; }; - uade123 = callPackage ../applications/audio/uade123 {}; + uade = callPackage ../applications/audio/uade {}; udevil = callPackage ../applications/misc/udevil {};