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

Merge pull request #21711 from mimadrid/fix/picard

Browse Source 
picard: fix compilation and remove unused buildInputs
This commit is contained in:
Pascal Wittmann 2017-01-06 14:50:08 +01:00 committed by GitHub
commit 99c8e8e71f
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,4 @@
{ stdenv, python2Packages, fetchurl, gettext { stdenv, python2Packages, fetchurl, gettext, chromaprint }:
, pkgconfig, libofa, ffmpeg, chromaprint
}:
let let
version = "1.3.2"; version = "1.3.2";
@ -14,12 +12,7 @@ in pythonPackages.buildPythonApplication {
sha256 = "0821xb7gyg0rhch8s3qkzmak90wjpcxkv9a364yv6bmqc12j6a77"; sha256 = "0821xb7gyg0rhch8s3qkzmak90wjpcxkv9a364yv6bmqc12j6a77";
}; };
buildInputs = [ buildInputs = [ gettext ];
pkgconfig
ffmpeg
libofa
gettext
];
propagatedBuildInputs = with pythonPackages; [ propagatedBuildInputs = with pythonPackages; [
pyqt4 pyqt4

8
pkgs/top-level/python-packages.nix
View File

@ -15109,16 +15109,16 @@ in {
}; };
mutagen = buildPythonPackage (rec { mutagen = buildPythonPackage (rec {
name = "mutagen-1.34"; name = "mutagen-1.36";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "mirror://pypi/m/mutagen/${name}.tar.gz"; url = "mirror://pypi/m/mutagen/${name}.tar.gz";
sha256 = "06anfzpjajwwh25n3afavwafrix3abahgwfr2zinrhqh2w98kw5s"; sha256 = "1kabb9b81hgvpd3wcznww549vss12b1xlvpnxg1r6n4c7gikgvnp";
}; };
# Needed for tests only # Needed for tests only
buildInputs = [ pkgs.faad2 pkgs.flac pkgs.vorbis-tools pkgs.liboggz buildInputs = with self; [ pkgs.faad2 pkgs.flac pkgs.vorbis-tools pkgs.liboggz
pkgs.glibcLocales pkgs.glibcLocales pytest
]; ];
LC_ALL = "en_US.UTF-8"; LC_ALL = "en_US.UTF-8";