public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #21587 from peterhoeg/f/puddletag

Browse Source 
puddletag: get rid of pypkgs variable
This commit is contained in:
Frederik Rietdijk 2017-01-02 23:02:26 +01:00 committed by GitHub
commit 93cabca3bd
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/audio/puddletag/default.nix
View File

@ -1,10 +1,9 @@
{ stdenv, fetchFromGitHub, python2Packages, makeWrapper, chromaprint }: { stdenv, fetchFromGitHub, python2Packages, makeWrapper, chromaprint }:
let let
pypkgs = python2Packages;
pname = "puddletag"; pname = "puddletag";
in pypkgs.buildPythonApplication rec { in python2Packages.buildPythonApplication rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
version = "1.2.0"; version = "1.2.0";
@ -17,11 +16,9 @@ in pypkgs.buildPythonApplication rec {
sourceRoot = "${pname}-v${version}-src/source"; sourceRoot = "${pname}-v${version}-src/source";
disabled = pypkgs.isPy3k; # work to support python 3 has not begun disabled = python2Packages.isPy3k; # work to support python 3 has not begun
outputs = [ "out" ]; propagatedBuildInputs = [ chromaprint ] ++ (with python2Packages; [
propagatedBuildInputs = [ chromaprint ] ++ (with pypkgs; [
configobj configobj
mutagen mutagen
pyparsing pyparsing
@ -35,7 +32,7 @@ in pypkgs.buildPythonApplication rec {
siteDir=$(toPythonPath $out) siteDir=$(toPythonPath $out)
mkdir -p $siteDir mkdir -p $siteDir
PYTHONPATH=$PYTHONPATH:$siteDir PYTHONPATH=$PYTHONPATH:$siteDir
${pypkgs.python.interpreter} setup.py install --prefix $out ${python2Packages.python.interpreter} setup.py install --prefix $out
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {