From 4d06bf70f4580d5cb907278dd3c384c305f95c74 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 19 Feb 2016 13:12:11 +0100 Subject: buildPythonApplication: use new function for Python applications --- pkgs/tools/audio/beets/alternatives-plugin.nix | 4 ++-- pkgs/tools/audio/beets/default.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs/tools/audio') diff --git a/pkgs/tools/audio/beets/alternatives-plugin.nix b/pkgs/tools/audio/beets/alternatives-plugin.nix index 1b0c9b3992b97..75f74e71be529 100644 --- a/pkgs/tools/audio/beets/alternatives-plugin.nix +++ b/pkgs/tools/audio/beets/alternatives-plugin.nix @@ -1,6 +1,6 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pythonPackages }: +{ stdenv, buildPythonApplication, fetchFromGitHub, pythonPackages }: -buildPythonPackage rec { +buildPythonApplication rec { name = "beets-alternatives-${version}"; version = "0.8.2"; diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 91407331d7ca5..4532d6424116e 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, writeScript, glibcLocales -, buildPythonPackage, pythonPackages, python, imagemagick +, buildPythonApplication, pythonPackages, python, imagemagick , enableAcousticbrainz ? true , enableAcoustid ? true @@ -68,7 +68,7 @@ let testShell = "${bashInteractive}/bin/bash --norc"; completion = "${bashCompletion}/share/bash-completion/bash_completion"; -in buildPythonPackage rec { +in buildPythonApplication rec { name = "beets-${version}"; version = "1.3.17"; namePrefix = ""; @@ -103,7 +103,7 @@ in buildPythonPackage rec { ++ optional enableThumbnails pythonPackages.pyxdg ++ optional enableWeb pythonPackages.flask ++ optional enableAlternatives (import ./alternatives-plugin.nix { - inherit stdenv buildPythonPackage pythonPackages fetchFromGitHub; + inherit stdenv buildPythonApplication pythonPackages fetchFromGitHub; }); buildInputs = with pythonPackages; [ -- cgit 1.4.1