Revert Merge x-updates into master due to mesa bloat
See #490 discussion. This reverts commit1278859d31, reversing changes made to0c020c98f9. Conflicts: pkgs/desktops/xfce/core/xfce4-session.nix (take master) pkgs/lib/misc.nix (auto)
This commit is contained in:
@@ -1,24 +1,18 @@
|
||||
{ stdenv, fetchurl, yacc, flex, pkgconfig, glib, dbus, dbus_tools, libiconvOrEmpty }:
|
||||
{ stdenv, fetchurl, yacc, flex, pkgconfig, glib, libintlOrEmpty }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
p_name = "vala";
|
||||
ver_maj = "0.19";
|
||||
ver_min = "0";
|
||||
|
||||
version = "0.17.2";
|
||||
name = "vala-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${p_name}/${ver_maj}/${name}.tar.xz";
|
||||
sha256 = "1vn524hcnaggz8zx49mvf7p4z1mscrlj2syg7jjhph8nak5wi0bp";
|
||||
url = "mirror://gnome/sources/vala/0.17/${name}.tar.xz";
|
||||
sha256 = "09i2s0dwmrk147ind2dx7nq845g12fp6fsjqrphhrr0dbi0zzgh3";
|
||||
};
|
||||
name = "${p_name}-${ver_maj}.${ver_min}";
|
||||
|
||||
postPatch = "patchShebangs .";
|
||||
|
||||
nativeBuildInputs = [ yacc flex pkgconfig ];
|
||||
|
||||
buildInputs = [ glib ] ++ libiconvOrEmpty
|
||||
++ stdenv.lib.optional doCheck [ dbus dbus_tools ];
|
||||
|
||||
doCheck = false; # problems when launching dbus tests
|
||||
buildInputs = [ glib ] ++ libintlOrEmpty;
|
||||
|
||||
meta = {
|
||||
description = "Compiler for the GObject type system";
|
||||
|
||||
Reference in New Issue
Block a user