forked from mirrors/nixpkgs
gyp: Revive old SVN version to build Chromium.
Works around regression from a305e6855d
.
We're also marking it lowPrio to make sure nobody will accidentally
reference it using nix-env -i.
Until we have fixed #7402, we're going to build with the old gyp version
to prevent being affected by https://crbug.com/462153.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
parent
5f50f23013
commit
b26de39252
|
@ -113,7 +113,7 @@ let
|
||||||
glib gtk dbus_glib
|
glib gtk dbus_glib
|
||||||
libXScrnSaver libXcursor libXtst mesa
|
libXScrnSaver libXcursor libXtst mesa
|
||||||
pciutils protobuf speechd libXdamage
|
pciutils protobuf speechd libXdamage
|
||||||
pythonPackages.gyp pythonPackages.ply pythonPackages.jinja2
|
pythonPackages.gyp_svn1977 pythonPackages.ply pythonPackages.jinja2
|
||||||
] ++ optional gnomeKeyringSupport libgnome_keyring3
|
] ++ optional gnomeKeyringSupport libgnome_keyring3
|
||||||
++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
|
++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
|
||||||
++ optional enableSELinux libselinux
|
++ optional enableSELinux libselinux
|
||||||
|
|
|
@ -5833,6 +5833,28 @@ let
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Needed to build Chromium until #7402 is fixed.
|
||||||
|
gyp_svn1977 = pkgs.lowPrio (buildPythonPackage rec {
|
||||||
|
rev = "1977";
|
||||||
|
name = "gyp-r${rev}";
|
||||||
|
|
||||||
|
src = pkgs.fetchsvn {
|
||||||
|
url = "http://gyp.googlecode.com/svn/trunk";
|
||||||
|
inherit rev;
|
||||||
|
sha256 = "0vnr75yd3bidysiwl9lljvf1dv6v9m9xqdnx0hdgyl92w689n9j8";
|
||||||
|
};
|
||||||
|
|
||||||
|
patches = optionals pkgs.stdenv.isDarwin [
|
||||||
|
../development/python-modules/gyp/no-darwin-cflags.patch
|
||||||
|
];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
homepage = http://code.google.com/p/gyp;
|
||||||
|
license = stdenv.lib.licenses.bsd3;
|
||||||
|
description = "Generate Your Projects";
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
guessit = buildPythonPackage rec {
|
guessit = buildPythonPackage rec {
|
||||||
version = "0.9.4";
|
version = "0.9.4";
|
||||||
name = "guessit-${version}";
|
name = "guessit-${version}";
|
||||||
|
|
Loading…
Reference in a new issue