diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-04-09 18:28:16 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-04-12 18:46:15 +0000 |
commit | fd2e737e0678ee7d8081baef05b305146a2c0034 (patch) | |
tree | ac3e9b27576a0382335532d126f9a66d486bc638 /nixpkgs/pkgs/servers/meteor | |
parent | cc207d720b6aa836e256c1ee9842bc739e630a8a (diff) | |
parent | 9e377a6ce42dccd9b624ae4ce8f978dc892ba0e2 (diff) | |
download | nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.gz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.bz2 nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.lz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.xz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.zst nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.zip |
Merge remote-tracking branch 'nixpkgs/nixos-unstable'
Diffstat (limited to 'nixpkgs/pkgs/servers/meteor')
-rw-r--r-- | nixpkgs/pkgs/servers/meteor/default.nix | 87 |
1 files changed, 49 insertions, 38 deletions
diff --git a/nixpkgs/pkgs/servers/meteor/default.nix b/nixpkgs/pkgs/servers/meteor/default.nix index 96363583b62e..ac870a8d5d15 100644 --- a/nixpkgs/pkgs/servers/meteor/default.nix +++ b/nixpkgs/pkgs/servers/meteor/default.nix @@ -2,15 +2,25 @@ let version = "1.12"; + + inherit (stdenv.hostPlatform) system; + + srcs = { + x86_64-linux = fetchurl { + url = "https://static-meteor.netdna-ssl.com/packages-bootstrap/${version}/meteor-bootstrap-os.linux.x86_64.tar.gz"; + sha256 = "0l3zc76djzypvc0dm5ikv5ybb6574qd6kdbbkarzc2dxx64wkyvb"; + }; + x86_64-darwin = fetchurl { + url = "https://static-meteor.netdna-ssl.com/packages-bootstrap/${version}/meteor-bootstrap-os.osx.x86_64.tar.gz"; + sha256 = "01gn3m6qacp3ibvp0rcvm2pq7fi1xds02ws0irypldh7vz3930jl"; + }; + }; in stdenv.mkDerivation { inherit version; pname = "meteor"; - src = fetchurl { - url = "https://static-meteor.netdna-ssl.com/packages-bootstrap/${version}/meteor-bootstrap-os.linux.x86_64.tar.gz"; - sha256 = "0l3zc76djzypvc0dm5ikv5ybb6574qd6kdbbkarzc2dxx64wkyvb"; - }; + src = srcs.${system}; #dontStrip = true; @@ -30,38 +40,6 @@ stdenv.mkDerivation { toolsDir=$(dirname $(find $out/packages -print | grep "meteor-tool/.*/tools/index.js$")) ln -s $toolsDir $out/tools - # Patch Meteor to dynamically fixup shebangs and ELF metadata where - # necessary. - pushd $out - patch -p1 < ${./main.patch} - popd - substituteInPlace $out/tools/cli/main.js \ - --replace "@INTERPRETER@" "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --replace "@RPATH@" "${lib.makeLibraryPath [ stdenv.cc.cc zlib ]}" \ - --replace "@PATCHELF@" "${patchelf}/bin/patchelf" - - # Patch node. - node=$devBundle/bin/node - patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - --set-rpath "$(patchelf --print-rpath $node):${stdenv.cc.cc.lib}/lib" \ - $node - - # Patch mongo. - for p in $devBundle/mongodb/bin/mongo{,d}; do - patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - --set-rpath "$(patchelf --print-rpath $p):${lib.makeLibraryPath [ stdenv.cc.cc zlib ]}" \ - $p - done - - # Patch node dlls. - for p in $(find $out/packages -name '*.node'); do - patchelf \ - --set-rpath "$(patchelf --print-rpath $p):${stdenv.cc.cc.lib}/lib" \ - $p || true - done - # Meteor needs an initial package-metadata in $HOME/.meteor, # otherwise it fails spectacularly. mkdir -p $out/bin @@ -75,16 +53,49 @@ stdenv.mkDerivation { chmod +w "\$HOME/.meteor/package-metadata/v2.0.1/packages.data.db" fi - $node \''${TOOL_NODE_FLAGS} $out/tools/index.js "\$@" + $out/dev_bundle/bin/node --no-wasm-code-gc \''${TOOL_NODE_FLAGS} $out/tools/index.js "\$@" EOF chmod +x $out/bin/meteor ''; + postFixup = lib.optionalString stdenv.isLinux '' + # Patch Meteor to dynamically fixup shebangs and ELF metadata where + # necessary. + pushd $out + patch -p1 < ${./main.patch} + popd + substituteInPlace $out/tools/cli/main.js \ + --replace "@INTERPRETER@" "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --replace "@RPATH@" "${lib.makeLibraryPath [ stdenv.cc.cc zlib ]}" \ + --replace "@PATCHELF@" "${patchelf}/bin/patchelf" + + # Patch node. + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-rpath "$(patchelf --print-rpath $out/dev_bundle/bin/node):${stdenv.cc.cc.lib}/lib" \ + $out/dev_bundle/bin/node + + # Patch mongo. + for p in $out/dev_bundle/mongodb/bin/mongo{,d}; do + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-rpath "$(patchelf --print-rpath $p):${lib.makeLibraryPath [ stdenv.cc.cc zlib ]}" \ + $p + done + + # Patch node dlls. + for p in $(find $out/packages -name '*.node'); do + patchelf \ + --set-rpath "$(patchelf --print-rpath $p):${stdenv.cc.cc.lib}/lib" \ + $p || true + done + ''; + meta = with lib; { description = "Complete open source platform for building web and mobile apps in pure JavaScript"; homepage = "http://www.meteor.com"; license = licenses.mit; - platforms = [ "x86_64-linux" ]; + platforms = builtins.attrNames srcs; maintainers = with maintainers; [ cstrahan ]; }; } |