mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-26 04:43:09 +03:00
Move dependencies from ugly to good as the code moved
See: https://bugzilla.gnome.org/show_bug.cgi?id=774252
This commit is contained in:
parent
be5bff0214
commit
41a4fea5de
@ -4,7 +4,7 @@
|
||||
, libvpx, speex, flac, taglib, libshout
|
||||
, cairo, gdk_pixbuf, aalib, libcaca
|
||||
, libsoup, libpulseaudio, libintlOrEmpty
|
||||
, darwin
|
||||
, darwin, lame, mpg123
|
||||
}:
|
||||
|
||||
let
|
||||
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
|
||||
gst-plugins-base orc bzip2
|
||||
libdv libvpx speex flac taglib
|
||||
cairo gdk_pixbuf aalib libcaca
|
||||
libsoup libshout
|
||||
libsoup libshout lame mpg123
|
||||
]
|
||||
++ libintlOrEmpty
|
||||
++ optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]
|
||||
|
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchurl, meson, ninja, pkgconfig, python
|
||||
, gst-plugins-base, orc, gettext
|
||||
, a52dec, libcdio, libdvdread
|
||||
, lame, libmad, libmpeg2, x264, libintlOrEmpty, mpg123
|
||||
, libmad, libmpeg2, x264, libintlOrEmpty
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
gst-plugins-base orc
|
||||
a52dec libcdio libdvdread
|
||||
lame libmad libmpeg2 x264 mpg123
|
||||
libmad libmpeg2 x264
|
||||
] ++ libintlOrEmpty;
|
||||
|
||||
NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
|
||||
|
Loading…
Reference in New Issue
Block a user