diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-03-14 14:15:06 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-03-22 16:50:11 -0500 |
| commit | ed2a9cf65fe2bf02bc3e7070ca4b124260d99585 (patch) | |
| tree | eabfdcf2e6203d6da7f1ada80a785455533c9c80 /pkgs/development/libraries/gstreamer/bad/default.nix | |
| parent | 9e75fb5eb4f26de4e551137c3caaa78b9bf8b050 (diff) | |
| download | nixpkgs-ed2a9cf65fe2bf02bc3e7070ca4b124260d99585.tar nixpkgs-ed2a9cf65fe2bf02bc3e7070ca4b124260d99585.tar.gz nixpkgs-ed2a9cf65fe2bf02bc3e7070ca4b124260d99585.tar.bz2 nixpkgs-ed2a9cf65fe2bf02bc3e7070ca4b124260d99585.tar.lz nixpkgs-ed2a9cf65fe2bf02bc3e7070ca4b124260d99585.tar.xz nixpkgs-ed2a9cf65fe2bf02bc3e7070ca4b124260d99585.tar.zst nixpkgs-ed2a9cf65fe2bf02bc3e7070ca4b124260d99585.zip | |
treewide: remove libintl hacks
Diffstat (limited to 'pkgs/development/libraries/gstreamer/bad/default.nix')
| -rw-r--r-- | pkgs/development/libraries/gstreamer/bad/default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index d4cc2f43aaa..72fead258f5 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -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; } |