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

Move dependencies from ugly to good as the code moved

Browse Source 
See: https://bugzilla.gnome.org/show_bug.cgi?id=774252
This commit is contained in:
Bastian Köcher 2018-04-03 19:30:24 +02:00
parent be5bff0214
commit 41a4fea5de
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/gstreamer/good/default.nix
View File

@ -4,7 +4,7 @@
, libvpx, speex, flac, taglib, libshout , libvpx, speex, flac, taglib, libshout
, cairo, gdk_pixbuf, aalib, libcaca , cairo, gdk_pixbuf, aalib, libcaca
, libsoup, libpulseaudio, libintlOrEmpty , libsoup, libpulseaudio, libintlOrEmpty
, darwin , darwin, lame, mpg123
}: }:
let let
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
gst-plugins-base orc bzip2 gst-plugins-base orc bzip2
libdv libvpx speex flac taglib libdv libvpx speex flac taglib
cairo gdk_pixbuf aalib libcaca cairo gdk_pixbuf aalib libcaca
libsoup libshout libsoup libshout lame mpg123
] ]
++ libintlOrEmpty ++ libintlOrEmpty
++ optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ] ++ optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]

4
pkgs/development/libraries/gstreamer/ugly/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, python { stdenv, fetchurl, meson, ninja, pkgconfig, python
, gst-plugins-base, orc, gettext , gst-plugins-base, orc, gettext
, a52dec, libcdio, libdvdread , a52dec, libcdio, libdvdread
, lame, libmad, libmpeg2, x264, libintlOrEmpty, mpg123 , libmad, libmpeg2, x264, libintlOrEmpty
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gst-plugins-base orc gst-plugins-base orc
a52dec libcdio libdvdread a52dec libcdio libdvdread
lame libmad libmpeg2 x264 mpg123 libmad libmpeg2 x264
] ++ libintlOrEmpty; ] ++ libintlOrEmpty;
NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;