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: 344921c8e301
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9f33d6589afc
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Dec 24, 2020

  1. audacity: switch to cmake to fix missing plug-ins

    @Gerschtli
    Gerschtli committed Dec 24, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    de1d520 View commit details

Commits on Jan 1, 2021

  1. Merge pull request #107465 from Gerschtli/fix/audacity 

    audacity: switch to cmake to fix missing plug-ins
    @SuperSandro2000
    SuperSandro2000 authored Jan 1, 2021

    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
    9f33d65 View commit details
Showing with 5 additions and 15 deletions.
  1. +5 −15 pkgs/applications/audio/audacity/default.nix
20 changes: 5 additions & 15 deletions pkgs/applications/audio/audacity/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{ stdenv, fetchzip, wxGTK30, pkgconfig, file, gettext,
libvorbis, libmad, libjack2, lv2, lilv, serd, sord, sratom, suil, alsaLib, libsndfile, soxr, flac, lame,
expat, libid3tag, ffmpeg_3, soundtouch, /*, portaudio - given up fighting their portaudio.patch */
autoconf, automake, libtool
}:
cmake
}:

with stdenv.lib;

@@ -15,16 +15,8 @@ stdenv.mkDerivation rec {
sha256 = "1xk0piv72d2xd3p7igr916fhcbrm76fhjr418k1rlqdzzg1hfljn";
};

preConfigure = /* we prefer system-wide libs */ ''
autoreconf -vi # use system libraries
# we will get a (possibly harmless) warning during configure without this
substituteInPlace configure \
--replace /usr/bin/file ${file}/bin/file
'';

configureFlags = [
"--with-libsamplerate"
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
];

# audacity only looks for lame and ffmpeg at runtime, so we need to link them in manually
@@ -43,15 +35,13 @@ stdenv.mkDerivation rec {
"-lswscale"
];

nativeBuildInputs = [ pkgconfig autoconf automake libtool ];
nativeBuildInputs = [ pkgconfig cmake ];
buildInputs = [
file gettext wxGTK30 expat alsaLib
libsndfile soxr libid3tag libjack2 lv2 lilv serd sord sratom suil wxGTK30.gtk
ffmpeg_3 libmad lame libvorbis flac soundtouch
]; #ToDo: detach sbsms

enableParallelBuilding = true;

dontDisableStatic = true;
doCheck = false; # Test fails