diff options
author | Nikolay Korotkiy <sikmir@gmail.com> | 2019-08-05 15:13:59 +0300 |
---|---|---|
committer | worldofpeace <worldofpeace@protonmail.ch> | 2019-08-05 16:39:30 -0400 |
commit | 9a9dc03cf49ab1672611ec07aead6130fd65b2be (patch) | |
tree | 80a30ebfb5018669bc44aa9147c7bdd5e85119f0 /pkgs/applications/audio/cantata | |
parent | c91f36234c9dc85f1a42312aeaaacc5730d614d0 (diff) | |
download | nixpkgs-9a9dc03cf49ab1672611ec07aead6130fd65b2be.tar nixpkgs-9a9dc03cf49ab1672611ec07aead6130fd65b2be.tar.gz nixpkgs-9a9dc03cf49ab1672611ec07aead6130fd65b2be.tar.bz2 nixpkgs-9a9dc03cf49ab1672611ec07aead6130fd65b2be.tar.lz nixpkgs-9a9dc03cf49ab1672611ec07aead6130fd65b2be.tar.xz nixpkgs-9a9dc03cf49ab1672611ec07aead6130fd65b2be.tar.zst nixpkgs-9a9dc03cf49ab1672611ec07aead6130fd65b2be.zip |
cantata: use qt5's mkDerivation
see #65399
Diffstat (limited to 'pkgs/applications/audio/cantata')
-rw-r--r-- | pkgs/applications/audio/cantata/default.nix | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index dc805a8caf9..292f28554d0 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, vlc +{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig, vlc , qtbase, qtmultimedia, qtsvg, qttools # Cantata doesn't build with cdparanoia enabled so we disable that @@ -35,7 +35,7 @@ let withUdisks = (withTaglib && withDevices); -in stdenv.mkDerivation rec { +in mkDerivation rec { name = "${pname}-${version}"; src = fetchFromGitHub { @@ -46,20 +46,20 @@ in stdenv.mkDerivation rec { }; buildInputs = [ vlc qtbase qtmultimedia qtsvg ] - ++ stdenv.lib.optionals withTaglib [ taglib taglib_extras ] - ++ stdenv.lib.optionals withReplaygain [ ffmpeg speex mpg123 ] - ++ stdenv.lib.optional withCdda cdparanoia - ++ stdenv.lib.optional withCddb libcddb - ++ stdenv.lib.optional withLame lame - ++ stdenv.lib.optional withMtp libmtp - ++ stdenv.lib.optional withMusicbrainz libmusicbrainz5 - ++ stdenv.lib.optional withUdisks udisks2; + ++ lib.optionals withTaglib [ taglib taglib_extras ] + ++ lib.optionals withReplaygain [ ffmpeg speex mpg123 ] + ++ lib.optional withCdda cdparanoia + ++ lib.optional withCddb libcddb + ++ lib.optional withLame lame + ++ lib.optional withMtp libmtp + ++ lib.optional withMusicbrainz libmusicbrainz5 + ++ lib.optional withUdisks udisks2; nativeBuildInputs = [ cmake pkgconfig qttools ]; enableParallelBuilding = true; - cmakeFlags = stdenv.lib.flatten [ + cmakeFlags = lib.flatten [ (fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ]) (fstats withReplaygain [ "FFMPEG" "MPG123" "SPEEXDSP" ]) (fstat withCdda "CDPARANOIA") @@ -76,7 +76,7 @@ in stdenv.mkDerivation rec { "-DENABLE_HTTPS_SUPPORT=ON" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://github.com/cdrummond/cantata; description = "A graphical client for MPD"; license = licenses.gpl3; |