diff options
| author | Christine Koppelt <cko@users.noreply.github.com> | 2016-11-10 00:11:42 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-11-10 00:11:42 +0100 |
| commit | 1bf7440b548499c17681ef8235e0b718c132d23c (patch) | |
| tree | becf1ed9889da0eaee9bf9a67d32b3eb1861144c | |
| parent | 12d1b5c38871772d84a773e767bf70d963a534c2 (diff) | |
| download | nixpkgs-1bf7440b548499c17681ef8235e0b718c132d23c.tar nixpkgs-1bf7440b548499c17681ef8235e0b718c132d23c.tar.gz nixpkgs-1bf7440b548499c17681ef8235e0b718c132d23c.tar.bz2 nixpkgs-1bf7440b548499c17681ef8235e0b718c132d23c.tar.lz nixpkgs-1bf7440b548499c17681ef8235e0b718c132d23c.tar.xz nixpkgs-1bf7440b548499c17681ef8235e0b718c132d23c.tar.zst nixpkgs-1bf7440b548499c17681ef8235e0b718c132d23c.zip | |
nodejs: cleanup files no longer needed (#20212)
| -rw-r--r-- | pkgs/development/web/nodejs/default-arch.patch | 24 | ||||
| -rw-r--r-- | pkgs/development/web/nodejs/v5.nix | 12 |
2 files changed, 0 insertions, 36 deletions
diff --git a/pkgs/development/web/nodejs/default-arch.patch b/pkgs/development/web/nodejs/default-arch.patch deleted file mode 100644 index e6d5b5428d7..00000000000 --- a/pkgs/development/web/nodejs/default-arch.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py -index 30f27d5..eb178a5 100644 ---- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py -+++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py -@@ -1018,12 +1018,15 @@ class XcodeSettings(object): - # Since the value returned by this function is only used when ARCHS is not - # set, then on iOS we return "i386", as the default xcode project generator - # does not set ARCHS if it is not set in the .gyp file. -- if self.isIOS: -+ try: -+ if self.isIOS: -+ return 'i386' -+ version, build = self._XcodeVersion() -+ if version >= '0500': -+ return 'x86_64' - return 'i386' -- version, build = self._XcodeVersion() -- if version >= '0500': -+ except: - return 'x86_64' -- return 'i386' - - class MacPrefixHeader(object): - """A class that helps with emulating Xcode's GCC_PREFIX_HEADER feature. diff --git a/pkgs/development/web/nodejs/v5.nix b/pkgs/development/web/nodejs/v5.nix deleted file mode 100644 index 7cd406abd2c..00000000000 --- a/pkgs/development/web/nodejs/v5.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser -, pkgconfig, runCommand, which, libtool -, callPackage -}@args: - -import ./nodejs.nix (args // rec { - version = "5.12.0"; - src = fetchurl { - url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.xz"; - sha256 = "4f926373f11f2a25156eee1804ec012eb912c42e5d34fc2909889da22efdadfe"; - }; -}) |