diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-06-09 18:45:44 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-06-09 19:08:19 +0200 |
| commit | 05b9e9f011f2873329e8da62a1147f520caa15db (patch) | |
| tree | b47920b0d08072697c3458850f169d91f1a2e726 /pkgs/desktops/gnome-3 | |
| parent | bc490a4b3f48a3667c206869c5cc15056149d6c1 (diff) | |
| download | nixlib-05b9e9f011f2873329e8da62a1147f520caa15db.tar nixlib-05b9e9f011f2873329e8da62a1147f520caa15db.tar.gz nixlib-05b9e9f011f2873329e8da62a1147f520caa15db.tar.bz2 nixlib-05b9e9f011f2873329e8da62a1147f520caa15db.tar.lz nixlib-05b9e9f011f2873329e8da62a1147f520caa15db.tar.xz nixlib-05b9e9f011f2873329e8da62a1147f520caa15db.tar.zst nixlib-05b9e9f011f2873329e8da62a1147f520caa15db.zip | |
gnome3.totem: fix build
Hopefully a proper fix for https://github.com/orivej/nixpkgs/commit/be17bccf38a2e5a5701115e15adf7ed5c585ac7d
Diffstat (limited to 'pkgs/desktops/gnome-3')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/totem/default.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix index b4c15b5dce2e..f852e053cdeb 100644 --- a/pkgs/desktops/gnome-3/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/core/totem/default.nix @@ -15,11 +15,6 @@ stdenv.mkDerivation rec { doCheck = true; - # https://bugs.launchpad.net/ubuntu/+source/totem/+bug/1712021 - # https://bugzilla.gnome.org/show_bug.cgi?id=784236 - # https://github.com/mesonbuild/meson/issues/1994 - enableParallelBuilding = false; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; nativeBuildInputs = [ meson ninja vala pkgconfig intltool python3Packages.python itstool wrapGAppsHook ]; @@ -46,7 +41,13 @@ stdenv.mkDerivation rec { patchShebangs . ''; - mesonFlags = [ "-Dwith-nautilusdir=lib/nautilus/extensions-3.0" ]; + mesonFlags = [ + "-Dwith-nautilusdir=lib/nautilus/extensions-3.0" + # https://bugs.launchpad.net/ubuntu/+source/totem/+bug/1712021 + # https://bugzilla.gnome.org/show_bug.cgi?id=784236 + # https://github.com/mesonbuild/meson/issues/1994 + "-Denable-vala=no" + ]; wrapPrefixVariables = [ "PYTHONPATH" ]; |