diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-07-05 08:55:26 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-07-05 08:55:26 +0200 |
| commit | 5328aac7be5b7ebf794349f915a379efd04b018b (patch) | |
| tree | 029547f7673a785c42f12770a68a3ec31a297bf9 /pkgs/applications/audio | |
| parent | f203b32bb8e824a75f89fd9805680b4a8e92d2a5 (diff) | |
| parent | c73f0caea5f0822ea044b4f90de4b64706d91362 (diff) | |
| download | nixlib-5328aac7be5b7ebf794349f915a379efd04b018b.tar nixlib-5328aac7be5b7ebf794349f915a379efd04b018b.tar.gz nixlib-5328aac7be5b7ebf794349f915a379efd04b018b.tar.bz2 nixlib-5328aac7be5b7ebf794349f915a379efd04b018b.tar.lz nixlib-5328aac7be5b7ebf794349f915a379efd04b018b.tar.xz nixlib-5328aac7be5b7ebf794349f915a379efd04b018b.tar.zst nixlib-5328aac7be5b7ebf794349f915a379efd04b018b.zip | |
Merge branch 'staging'
Comparison looks OK; I'll try some fixes on master directly. http://hydra.nixos.org/eval/1372577?compare=1372497
Diffstat (limited to 'pkgs/applications/audio')
| -rw-r--r-- | pkgs/applications/audio/mpg123/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index 2909dd70ce9a..59012432caf6 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchurl, alsaLib -, buildPlatform, hostPlatform +, hostPlatform }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib; - ${if buildPlatform != hostPlatform then "configureFlags" else null} = + configureFlags = stdenv.lib.optional (hostPlatform ? mpg123) "--with-cpu=${hostPlatform.mpg123.cpu}"; meta = { |