diff options
| author | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-15 20:21:58 +0700 |
|---|---|---|
| committer | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-16 17:58:11 +0700 |
| commit | badf51221db8fae81bf9948c39eaf8342dfd5597 (patch) | |
| tree | 34eeb35ca97f0b081da465e9ddd6c120a9d2b7df /pkgs/misc/jackaudio | |
| parent | a9bb54359eeedf2594fdf191de5b673fd1dd102d (diff) | |
treewide: stdenv.lib -> lib
Diffstat (limited to 'pkgs/misc/jackaudio')
| -rw-r--r-- | pkgs/misc/jackaudio/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/misc/jackaudio/jack1.nix | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 556bb6a7408f..fd50aa6de54b 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, python3Packages, makeWrapper +{ lib, stdenv, fetchFromGitHub, pkgconfig, python3Packages, makeWrapper , bash, libsamplerate, libsndfile, readline, eigen, celt , wafHook # Darwin Dependencies @@ -12,10 +12,10 @@ , prefix ? "" }: -with stdenv.lib; +with lib; let inherit (python3Packages) python dbus-python; - shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; + shouldUsePkg = pkg: if pkg != null && lib.any (lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; libOnly = prefix == "lib"; diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix index 2a5bf806d0f3..26d7cf18dd56 100644 --- a/pkgs/misc/jackaudio/jack1.nix +++ b/pkgs/misc/jackaudio/jack1.nix @@ -5,7 +5,7 @@ }: let - shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; + shouldUsePkg = pkg: if pkg != null && lib.any (lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; optAlsaLib = shouldUsePkg alsaLib; optDb = shouldUsePkg db; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }; configureFlags = [ - (stdenv.lib.enableFeature (optLibffado != null) "firewire") + (lib.enableFeature (optLibffado != null) "firewire") ]; nativeBuildInputs = [ pkgconfig ]; |