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

treewide: remove libintl hacks

Browse Source
This commit is contained in:
Matthew Bauer
2018-03-14 14:15:06 -05:00
parent 9e75fb5eb4
commit ed2a9cf65f
56 changed files with 107 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/gstreamer/bad/default.nix
View File

@@ -6,7 +6,7 @@
, openjpeg, libopus, librsvg
, wildmidi, fluidsynth, libvdpau, wayland
, libwebp, xvidcore, gnutls, mjpegtools
, libGLU_combined, libintlOrEmpty, libgme
, libGLU_combined, libintl, libgme
, openssl, x265, libxml2
}:
@@ -63,8 +63,8 @@ stdenv.mkDerivation rec {
fluidsynth libvdpau
libwebp xvidcore gnutls libGLU_combined
libgme openssl x265 libxml2
libintl
]
++ libintlOrEmpty
++ optional faacSupport faac
# for gtksink
++ optional gtkSupport gtk3
@@ -75,7 +75,5 @@ stdenv.mkDerivation rec {
# TODO: mjpegtools uint64_t is not compatible with guint64 on Darwin
++ optional (!stdenv.isDarwin) mjpegtools;
LDFLAGS = optionalString stdenv.isDarwin "-lintl";
enableParallelBuilding = true;
}

7
pkgs/development/libraries/gstreamer/base/default.nix
View File

@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, python, gstreamer, gobjectIntrospection
, orc, alsaLib, libXv, pango, libtheora
, cdparanoia, libvisual, libintlOrEmpty
, cdparanoia, libvisual, libintl
}:
stdenv.mkDerivation rec {
@@ -25,9 +25,8 @@ stdenv.mkDerivation rec {
];
buildInputs = [
orc libXv pango libtheora cdparanoia
orc libXv pango libtheora cdparanoia libintl
]
++ libintlOrEmpty
++ stdenv.lib.optional stdenv.isLinux alsaLib
++ stdenv.lib.optional (!stdenv.isDarwin) libvisual;
@@ -40,7 +39,5 @@ stdenv.mkDerivation rec {
"--disable-cdparanoia"
] else null;
NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
enableParallelBuilding = true;
}

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

@@ -3,7 +3,7 @@
, libv4l, libdv, libavc1394, libiec61883
, libvpx, speex, flac, taglib, libshout
, cairo, gdk_pixbuf, aalib, libcaca
, libsoup, libpulseaudio, libintlOrEmpty
, libsoup, libpulseaudio, libintl
, darwin
}:
@@ -38,9 +38,8 @@ stdenv.mkDerivation rec {
gst-plugins-base orc bzip2
libdv libvpx speex flac taglib
cairo gdk_pixbuf aalib libcaca
libsoup libshout
libsoup libshout libintl
]
++ libintlOrEmpty
++ optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]
++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 ];
@@ -48,6 +47,4 @@ stdenv.mkDerivation rec {
mkdir -p "$dev/lib/gstreamer-1.0"
mv "$out/lib/gstreamer-1.0/"*.la "$dev/lib/gstreamer-1.0"
'';
LDFLAGS = optionalString stdenv.isDarwin "-lintl";
}

7
pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix
View File

@@ -1,6 +1,6 @@
{ fetchurl, stdenv, pkgconfig, python, gstreamer, xorg, alsaLib, cdparanoia
, libogg, libtheora, libvorbis, freetype, pango, liboil, glib, cairo, orc
, libintlOrEmpty
, libintl
, ApplicationServices
, # Whether to build no plugins that have external dependencies
# (except the ALSA plugin).
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
# TODO : v4l, libvisual
buildInputs =
[ pkgconfig glib cairo orc ]
[ pkgconfig glib cairo orc libintl ]
# can't build alsaLib on darwin
++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib
++ stdenv.lib.optionals (!minimalDeps)
@@ -37,11 +37,8 @@ stdenv.mkDerivation rec {
liboil ]
# can't build cdparanoia on darwin
++ stdenv.lib.optional (!minimalDeps && !stdenv.isDarwin) cdparanoia
++ libintlOrEmpty
++ stdenv.lib.optional stdenv.isDarwin ApplicationServices;
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
propagatedBuildInputs = [ gstreamer ];
postInstall = "rm -rf $out/share/gtk-doc";

7
pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
View File

@@ -1,7 +1,7 @@
{ fetchurl, stdenv, lib, pkgconfig, gst-plugins-base, aalib, cairo
, flac, libjpeg, zlib, speex, libpng, libdv, libcaca, libvpx
, libiec61883, libavc1394, taglib, libpulseaudio, gdk_pixbuf, orc
, glib, gstreamer, bzip2, libsoup, libshout, ncurses, libintlOrEmpty
, glib, gstreamer, bzip2, libsoup, libshout, ncurses, libintl
, # Whether to build no plugins that have external dependencies
# (except the PulseAudio plugin).
minimalDeps ? false
@@ -23,15 +23,12 @@ stdenv.mkDerivation rec {
configureFlags = [ "--enable-experimental" "--disable-oss" ];
buildInputs =
[ pkgconfig glib gstreamer gst-plugins-base ]
[ pkgconfig glib gstreamer gst-plugins-base libintl ]
++ lib.optional stdenv.isLinux libpulseaudio
++ libintlOrEmpty
++ lib.optionals (!minimalDeps)
[ aalib libcaca cairo libdv flac libjpeg libpng speex
taglib bzip2 libvpx gdk_pixbuf orc libsoup libshout ];
NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
enableParallelBuilding = true;
postInstall = lib.optionalString (!minimalDeps) ''

6
pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix
View File

@@ -1,5 +1,5 @@
{ fetchurl, stdenv, pkgconfig, glib, gstreamer, gst-plugins-base
, libmad, libdvdread, libmpeg2, libcdio, a52dec, x264, orc, lame, libintlOrEmpty }:
, libmad, libdvdread, libmpeg2, libcdio, a52dec, x264, orc, lame, libintl }:
stdenv.mkDerivation rec {
name = "gst-plugins-ugly-0.10.19";
@@ -13,9 +13,7 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ pkgconfig glib gstreamer gst-plugins-base libmad libdvdread a52dec x264 orc lame ] ++ libintlOrEmpty;
NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
[ pkgconfig glib gstreamer gst-plugins-base libmad libdvdread a52dec x264 orc lame libintl ];
enableParallelBuilding = true;

6
pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix
View File

@@ -1,4 +1,4 @@
{ fetchurl, stdenv, perl, bison, flex, pkgconfig, glib, libxml2, libintlOrEmpty }:
{ fetchurl, stdenv, perl, bison, flex, pkgconfig, glib, libxml2, libintl }:
stdenv.mkDerivation rec {
name = "gstreamer-0.10.36";
@@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig libintl ];
buildInputs = [ perl bison flex ];
propagatedBuildInputs = [ glib libxml2 ] ++ libintlOrEmpty;
propagatedBuildInputs = [ glib libxml2 ];
patchPhase = ''
sed -i -e 's/^ /\t/' docs/gst/Makefile.in docs/libs/Makefile.in docs/plugins/Makefile.in

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

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