diff --git a/pkgs/carla/default.nix b/pkgs/carla/default.nix index 6641e99..b0a2375 100644 --- a/pkgs/carla/default.nix +++ b/pkgs/carla/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, alsaLib, file, fluidsynth, ffmpeg, jack2, +{ stdenv, lib, fetchFromGitHub, alsaLib, file, fluidsynth, ffmpeg, jack2, liblo, libpulseaudio, libsndfile, pkgconfig, python3Packages, which, withFrontend ? true, withQt ? true, qtbase ? null, wrapQtAppsHook ? null, withGtk2 ? true, gtk2 ? null, withGtk3 ? true, gtk3 ? null }: -with stdenv.lib; +with lib; assert withFrontend -> python3Packages ? pyqt5; assert withQt -> qtbase != null; @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = http://kxstudio.sf.net/carla; description = "An audio plugin host"; longDescription = '' diff --git a/pkgs/curie-font/default.nix b/pkgs/curie-font/default.nix index 830c0d2..2bd416c 100644 --- a/pkgs/curie-font/default.nix +++ b/pkgs/curie-font/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchgit, bdftopcf, mkfontdir, mkfontscale}: +{stdenv, lib, fetchgit, bdftopcf, mkfontdir, mkfontscale}: stdenv.mkDerivation rec { name = "curie-1.0"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { mkfontscale ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A slightly upscaled version of scientifica"; homepage = https://github.com/NerdyPepper/curie; license = lib.licences.ofl; diff --git a/pkgs/mopidy-mpd/default.nix b/pkgs/mopidy-mpd/default.nix index cbf6d25..5b5f6e9 100644 --- a/pkgs/mopidy-mpd/default.nix +++ b/pkgs/mopidy-mpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, mopidy }: +{ stdenv, lib, python3Packages, mopidy }: python3Packages.buildPythonApplication rec { pname = "Mopidy-MPD"; @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { # no tests implemented doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://github.com/mopidy/mopidy-mpd; description = "Mopidy extension for controlling playback from MPD clients"; license = licenses.asl20; diff --git a/pkgs/scientifica-font/default.nix b/pkgs/scientifica-font/default.nix index f2c18ff..a180bf4 100644 --- a/pkgs/scientifica-font/default.nix +++ b/pkgs/scientifica-font/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchgit, bdftopcf, mkfontdir, mkfontscale}: +{stdenv, lib, fetchgit, bdftopcf, mkfontdir, mkfontscale}: stdenv.mkDerivation rec { name = "scientifica-1.0"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { mkfontscale ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tall, condensed, bitmap font for geeks"; homepage = https://github.com/NerdyPepper/scientifica; license = licences.ofl; diff --git a/pkgs/squeezer/default.nix b/pkgs/squeezer/default.nix index 7620b8d..02ba00a 100644 --- a/pkgs/squeezer/default.nix +++ b/pkgs/squeezer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchzip, unzip +{ stdenv, lib, fetchFromGitHub, fetchzip, unzip , alsaLib, astyle, clang, freetype, gnumake, libjack2, xorg }: @@ -79,7 +79,7 @@ in stdenv.mkDerivation rec { xorg.libXrandr ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.mzuther.de/en/software/squeezer"; description = "Flexible general-purpose audio compressor with a touch of citrus"; maintainers = [ maintainers.jpotier ]; diff --git a/pkgs/surge/default.nix b/pkgs/surge/default.nix index 46e098a..f0e482b 100644 --- a/pkgs/surge/default.nix +++ b/pkgs/surge/default.nix @@ -1,4 +1,5 @@ { stdenv +, lib , cmake , fetchFromGitHub , ncurses @@ -75,7 +76,7 @@ in stdenv.mkDerivation { cp -r target/lv2/Release/Surge.lv2 $out/lib/lv2/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Synthesizer plug-in with wavetables, originally by Claes Johanson"; homepage = "https://surge-synthesizer.github.io"; diff --git a/pkgs/vcv-rack/default.nix b/pkgs/vcv-rack/default.nix index 5d4e4f2..d48c53b 100644 --- a/pkgs/vcv-rack/default.nix +++ b/pkgs/vcv-rack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, fetchzip, fetchFromGitHub, pkgconfig +{ stdenv, lib, makeWrapper, fetchzip, fetchFromGitHub, pkgconfig , alsaLib, curl, glew, glfw, gtk2-x11, jansson, libjack2, libXext, libXi , libzip, rtaudio, rtmidi, speex, libsamplerate }: @@ -36,7 +36,7 @@ let sha256 = "17kd0lh2x3x12bxkyhq6z8sg6vxln8m9qirf0basvcsmylr6rb64"; }; in -with stdenv.lib; stdenv.mkDerivation rec { +with lib; stdenv.mkDerivation rec { pname = "VCV-Rack"; version = "1.1.6"; @@ -89,7 +89,7 @@ with stdenv.lib; stdenv.mkDerivation rec { wrapProgram $out/bin/Rack --add-flags "-s $out/share/vcv-rack" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Open-source virtual modular synthesizer"; homepage = "https://vcvrack.com/"; # The source is BSD-3 licensed, some of the art is CC-BY-NC 4.0 or under a