diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2016-02-23 16:02:10 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2016-02-23 16:02:10 +0100 |
| commit | 40ca841c5c0b264a0d1a1ffc2f912e17e30f9caa (patch) | |
| tree | 5172f6511291bf6daf7a7f228f29f16b30de6fb8 /pkgs/tools/audio | |
| parent | b1c8fb8685311bff0f0db439650bbe8ecaf89e9c (diff) | |
| parent | 4d06bf70f4580d5cb907278dd3c384c305f95c74 (diff) | |
| download | nixlib-40ca841c5c0b264a0d1a1ffc2f912e17e30f9caa.tar nixlib-40ca841c5c0b264a0d1a1ffc2f912e17e30f9caa.tar.gz nixlib-40ca841c5c0b264a0d1a1ffc2f912e17e30f9caa.tar.bz2 nixlib-40ca841c5c0b264a0d1a1ffc2f912e17e30f9caa.tar.lz nixlib-40ca841c5c0b264a0d1a1ffc2f912e17e30f9caa.tar.xz nixlib-40ca841c5c0b264a0d1a1ffc2f912e17e30f9caa.tar.zst nixlib-40ca841c5c0b264a0d1a1ffc2f912e17e30f9caa.zip | |
Merge pull request #13124 from FRidh/buildPythonApplication
buildPythonApplication: use new function for Python applications
Diffstat (limited to 'pkgs/tools/audio')
| -rw-r--r-- | pkgs/tools/audio/beets/alternatives-plugin.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/audio/beets/default.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/audio/beets/alternatives-plugin.nix b/pkgs/tools/audio/beets/alternatives-plugin.nix index 1b0c9b3992b9..75f74e71be52 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 91407331d7ca..4532d6424116 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; [ |