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/cogl/default.nix | |
| parent | 9e75fb5eb4f26de4e551137c3caaa78b9bf8b050 (diff) | |
| download | nixlib-ed2a9cf65fe2bf02bc3e7070ca4b124260d99585.tar nixlib-ed2a9cf65fe2bf02bc3e7070ca4b124260d99585.tar.gz nixlib-ed2a9cf65fe2bf02bc3e7070ca4b124260d99585.tar.bz2 nixlib-ed2a9cf65fe2bf02bc3e7070ca4b124260d99585.tar.lz nixlib-ed2a9cf65fe2bf02bc3e7070ca4b124260d99585.tar.xz nixlib-ed2a9cf65fe2bf02bc3e7070ca4b124260d99585.tar.zst nixlib-ed2a9cf65fe2bf02bc3e7070ca4b124260d99585.zip | |
treewide: remove libintl hacks
Diffstat (limited to 'pkgs/development/libraries/cogl/default.nix')
| -rw-r--r-- | pkgs/development/libraries/cogl/default.nix | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index 48b38c22af59..0209799f5fcd 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libGL, glib, gdk_pixbuf, xorg, libintlOrEmpty +{ stdenv, fetchurl, pkgconfig, libGL, glib, gdk_pixbuf, xorg, libintl , pangoSupport ? true, pango, cairo, gobjectIntrospection, wayland, gnome3 , gstreamerSupport ? true, gst_all_1 }: @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { sha256 = "03f0ha3qk7ca0nnkkcr1garrm1n1vvfqhkz9lwjm592fnv6ii9rr"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig libintl ]; configureFlags = [ "--enable-introspection" @@ -27,7 +27,6 @@ in stdenv.mkDerivation rec { glib gdk_pixbuf gobjectIntrospection wayland libGL libXrandr libXfixes libXcomposite libXdamage ] - ++ libintlOrEmpty ++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer gst_all_1.gst-plugins-base ]; @@ -37,8 +36,6 @@ in stdenv.mkDerivation rec { = stdenv.lib.optionalString (stdenv.isDarwin && pangoSupport) "-I${pango.dev}/include/pango-1.0 -I${cairo.dev}/include/cairo"; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - #doCheck = true; # all tests fail (no idea why) passthru = { |