diff options
| author | Pascal Wittmann <PascalWittmann@gmx.net> | 2017-01-06 14:50:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-06 14:50:08 +0100 |
| commit | 99c8e8e71f734ebc48ac6d3e8a6ac3e760ca7529 (patch) | |
| tree | 3a607c77d940390aafd5d8fb65654d3f58c8ed78 | |
| parent | 3c2cbd3259926a595a82fe502417b85e931002a1 (diff) | |
| parent | 0b3e1e0486bd85fe8163cbc62d64fef3cc8a94c2 (diff) | |
| download | nixlib-99c8e8e71f734ebc48ac6d3e8a6ac3e760ca7529.tar nixlib-99c8e8e71f734ebc48ac6d3e8a6ac3e760ca7529.tar.gz nixlib-99c8e8e71f734ebc48ac6d3e8a6ac3e760ca7529.tar.bz2 nixlib-99c8e8e71f734ebc48ac6d3e8a6ac3e760ca7529.tar.lz nixlib-99c8e8e71f734ebc48ac6d3e8a6ac3e760ca7529.tar.xz nixlib-99c8e8e71f734ebc48ac6d3e8a6ac3e760ca7529.tar.zst nixlib-99c8e8e71f734ebc48ac6d3e8a6ac3e760ca7529.zip | |
Merge pull request #21711 from mimadrid/fix/picard
picard: fix compilation and remove unused buildInputs
| -rw-r--r-- | pkgs/applications/audio/picard/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 8 |
2 files changed, 6 insertions, 13 deletions
diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 4b789e158bbf..bbd59f56f707 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -1,6 +1,4 @@ -{ stdenv, python2Packages, fetchurl, gettext -, pkgconfig, libofa, ffmpeg, chromaprint -}: +{ stdenv, python2Packages, fetchurl, gettext, chromaprint }: let version = "1.3.2"; @@ -14,12 +12,7 @@ in pythonPackages.buildPythonApplication { sha256 = "0821xb7gyg0rhch8s3qkzmak90wjpcxkv9a364yv6bmqc12j6a77"; }; - buildInputs = [ - pkgconfig - ffmpeg - libofa - gettext - ]; + buildInputs = [ gettext ]; propagatedBuildInputs = with pythonPackages; [ pyqt4 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 49a1e91e2784..2cdb2e9f3cdb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15109,16 +15109,16 @@ in { }; mutagen = buildPythonPackage (rec { - name = "mutagen-1.34"; + name = "mutagen-1.36"; src = pkgs.fetchurl { url = "mirror://pypi/m/mutagen/${name}.tar.gz"; - sha256 = "06anfzpjajwwh25n3afavwafrix3abahgwfr2zinrhqh2w98kw5s"; + sha256 = "1kabb9b81hgvpd3wcznww549vss12b1xlvpnxg1r6n4c7gikgvnp"; }; # Needed for tests only - buildInputs = [ pkgs.faad2 pkgs.flac pkgs.vorbis-tools pkgs.liboggz - pkgs.glibcLocales + buildInputs = with self; [ pkgs.faad2 pkgs.flac pkgs.vorbis-tools pkgs.liboggz + pkgs.glibcLocales pytest ]; LC_ALL = "en_US.UTF-8"; |