mpo/overlays-personal
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Phase out stdenv.lib

Browse source
This commit is contained in:
Martin Potier 2021-03-03 13:59:53 +02:00
parent aaced088e1
commit 360d1d4055
No known key found for this signature in database
GPG key ID: D4DD957DBA4AD89E
7 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/carla/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchFromGitHub, alsaLib, file, fluidsynth, ffmpeg, jack2, { stdenv, lib, fetchFromGitHub, alsaLib, file, fluidsynth, ffmpeg, jack2,
liblo, libpulseaudio, libsndfile, pkgconfig, python3Packages, liblo, libpulseaudio, libsndfile, pkgconfig, python3Packages,
which, withFrontend ? true, which, withFrontend ? true,
withQt ? true, qtbase ? null, wrapQtAppsHook ? null, withQt ? true, qtbase ? null, wrapQtAppsHook ? null,
withGtk2 ? true, gtk2 ? null, withGtk2 ? true, gtk2 ? null,
withGtk3 ? true, gtk3 ? null }: withGtk3 ? true, gtk3 ? null }:
with stdenv.lib; with lib;
assert withFrontend -> python3Packages ? pyqt5; assert withFrontend -> python3Packages ? pyqt5;
assert withQt -> qtbase != null; assert withQt -> qtbase != null;
@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
done done
''; '';
meta = with stdenv.lib; { meta = with lib; {
homepage = http://kxstudio.sf.net/carla; homepage = http://kxstudio.sf.net/carla;
description = "An audio plugin host"; description = "An audio plugin host";
longDescription = '' longDescription = ''

4
pkgs/curie-font/default.nix
View file

@ -1,4 +1,4 @@
{stdenv, fetchgit, bdftopcf, mkfontdir, mkfontscale}: {stdenv, lib, fetchgit, bdftopcf, mkfontdir, mkfontscale}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "curie-1.0"; name = "curie-1.0";
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
mkfontscale mkfontscale
''; '';
meta = with stdenv.lib; { meta = with lib; {
description = "A slightly upscaled version of scientifica"; description = "A slightly upscaled version of scientifica";
homepage = https://github.com/NerdyPepper/curie; homepage = https://github.com/NerdyPepper/curie;
license = lib.licences.ofl; license = lib.licences.ofl;

4
pkgs/mopidy-mpd/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, python3Packages, mopidy }: { stdenv, lib, python3Packages, mopidy }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "Mopidy-MPD"; pname = "Mopidy-MPD";
@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
# no tests implemented # no tests implemented
doCheck = false; doCheck = false;
meta = with stdenv.lib; { meta = with lib; {
homepage = https://github.com/mopidy/mopidy-mpd; homepage = https://github.com/mopidy/mopidy-mpd;
description = "Mopidy extension for controlling playback from MPD clients"; description = "Mopidy extension for controlling playback from MPD clients";
license = licenses.asl20; license = licenses.asl20;

4
pkgs/scientifica-font/default.nix
View file

@ -1,4 +1,4 @@
{stdenv, fetchgit, bdftopcf, mkfontdir, mkfontscale}: {stdenv, lib, fetchgit, bdftopcf, mkfontdir, mkfontscale}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "scientifica-1.0"; name = "scientifica-1.0";
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
mkfontscale mkfontscale
''; '';
meta = with stdenv.lib; { meta = with lib; {
description = "Tall, condensed, bitmap font for geeks"; description = "Tall, condensed, bitmap font for geeks";
homepage = https://github.com/NerdyPepper/scientifica; homepage = https://github.com/NerdyPepper/scientifica;
license = licences.ofl; license = licences.ofl;

4
pkgs/squeezer/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, fetchzip, unzip { stdenv, lib, fetchFromGitHub, fetchzip, unzip
, alsaLib, astyle, clang, freetype, gnumake, libjack2, xorg , alsaLib, astyle, clang, freetype, gnumake, libjack2, xorg
}: }:
@ -79,7 +79,7 @@ in stdenv.mkDerivation rec {
xorg.libXrandr xorg.libXrandr
]; ];
meta = with stdenv.lib; { meta = with lib; {
homepage = "http://www.mzuther.de/en/software/squeezer"; homepage = "http://www.mzuther.de/en/software/squeezer";
description = "Flexible general-purpose audio compressor with a touch of citrus"; description = "Flexible general-purpose audio compressor with a touch of citrus";
maintainers = [ maintainers.jpotier ]; maintainers = [ maintainers.jpotier ];

3
pkgs/surge/default.nix
View file

@ -1,4 +1,5 @@
{ stdenv { stdenv
, lib
, cmake , cmake
, fetchFromGitHub , fetchFromGitHub
, ncurses , ncurses
@ -75,7 +76,7 @@ in stdenv.mkDerivation {
cp -r target/lv2/Release/Surge.lv2 $out/lib/lv2/ 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"; description = "Synthesizer plug-in with wavetables, originally by Claes Johanson";
homepage = "https://surge-synthesizer.github.io"; homepage = "https://surge-synthesizer.github.io";

6
pkgs/vcv-rack/default.nix
View file

@ -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 , alsaLib, curl, glew, glfw, gtk2-x11, jansson, libjack2, libXext, libXi
, libzip, rtaudio, rtmidi, speex, libsamplerate }: , libzip, rtaudio, rtmidi, speex, libsamplerate }:
@ -36,7 +36,7 @@ let
sha256 = "17kd0lh2x3x12bxkyhq6z8sg6vxln8m9qirf0basvcsmylr6rb64"; sha256 = "17kd0lh2x3x12bxkyhq6z8sg6vxln8m9qirf0basvcsmylr6rb64";
}; };
in in
with stdenv.lib; stdenv.mkDerivation rec { with lib; stdenv.mkDerivation rec {
pname = "VCV-Rack"; pname = "VCV-Rack";
version = "1.1.6"; 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" wrapProgram $out/bin/Rack --add-flags "-s $out/share/vcv-rack"
''; '';
meta = with stdenv.lib; { meta = with lib; {
description = "Open-source virtual modular synthesizer"; description = "Open-source virtual modular synthesizer";
homepage = "https://vcvrack.com/"; homepage = "https://vcvrack.com/";
# The source is BSD-3 licensed, some of the art is CC-BY-NC 4.0 or under a # The source is BSD-3 licensed, some of the art is CC-BY-NC 4.0 or under a