diff options
author | Shamrock Lee <44064051+ShamrockLee@users.noreply.github.com> | 2021-10-04 01:08:14 +0800 |
---|---|---|
committer | Shamrock Lee <44064051+ShamrockLee@users.noreply.github.com> | 2021-10-04 02:13:08 +0800 |
commit | fecc5d7bfff23a211278cb1e1fc2a9c2dbfb43ea (patch) | |
tree | cd145312fd73ad3a93b8d930a72cdd4229669ea6 /pkgs/top-level/emscripten-packages.nix | |
parent | 441e405c77f73522cc6e39b864efd3facaffb8e2 (diff) |
treewide: pkgs/**.nix: remove trailing whitespaces
Manually remove trailing white spaces in `pkgs/**.nix` with the help of an editor Auto-generated nix expressions containing trailing whitespaces: * pkgs/development/haskell-modules/hackage-packages.nix * See issue https://github.com/NixOS/cabal2nix/issues/208 * pkgs/**/eggs.nix * I don't know how they are generated, but they seems to be Python-related.
Diffstat (limited to 'pkgs/top-level/emscripten-packages.nix')
-rw-r--r-- | pkgs/top-level/emscripten-packages.nix | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/pkgs/top-level/emscripten-packages.nix b/pkgs/top-level/emscripten-packages.nix index 7cf60df98dbfd..bc91b9e26a4f2 100644 --- a/pkgs/top-level/emscripten-packages.nix +++ b/pkgs/top-level/emscripten-packages.nix @@ -28,8 +28,8 @@ rec { libjson-c.a \ -o ./test1.js - echo "Using node to execute the test which basically outputs an error on stderr which we grep for" - ${pkgs.nodejs}/bin/node ./test1.js + echo "Using node to execute the test which basically outputs an error on stderr which we grep for" + ${pkgs.nodejs}/bin/node ./test1.js set +x if [ $? -ne 0 ]; then @@ -41,17 +41,17 @@ rec { echo "================= /testing json_c using node =================" ''; }); - + libxml2 = (pkgs.libxml2.override { stdenv = emscriptenStdenv; pythonSupport = false; }).overrideDerivation - (old: { + (old: { propagatedBuildInputs = [ zlib ]; buildInputs = old.buildInputs ++ [ pkg-config ]; # just override it with nothing so it does not fail - autoreconfPhase = "echo autoreconfPhase not used..."; + autoreconfPhase = "echo autoreconfPhase not used..."; configurePhase = '' HOME=$TMPDIR emconfigure ./configure --prefix=$out --without-python @@ -63,10 +63,10 @@ rec { set -x emcc -O2 -s EMULATE_FUNCTION_POINTER_CASTS=1 xmllint.o \ ./.libs/libxml2.a `pkg-config zlib --cflags` `pkg-config zlib --libs` -o ./xmllint.test.js \ - --embed-file ./test/xmlid/id_err1.xml + --embed-file ./test/xmlid/id_err1.xml - echo "Using node to execute the test which basically outputs an error on stderr which we grep for" - ${pkgs.nodejs}/bin/node ./xmllint.test.js --noout test/xmlid/id_err1.xml 2>&1 | grep 0bar + echo "Using node to execute the test which basically outputs an error on stderr which we grep for" + ${pkgs.nodejs}/bin/node ./xmllint.test.js --noout test/xmlid/id_err1.xml 2>&1 | grep 0bar set +x if [ $? -ne 0 ]; then @@ -77,8 +77,8 @@ rec { fi echo "================= /testing libxml2 using node =================" ''; - }); - + }); + xmlmirror = pkgs.buildEmscriptenPackage rec { pname = "xmlmirror"; version = "unstable-2016-06-05"; @@ -91,7 +91,7 @@ rec { rev = "4fd7e86f7c9526b8f4c1733e5c8b45175860a8fd"; sha256 = "1jasdqnbdnb83wbcnyrp32f36w3xwhwp0wq8lwwmhqagxrij1r4b"; }; - + configurePhase = '' rm -f fastXmlLint.js* # a fix for ERROR:root:For asm.js, TOTAL_MEMORY must be a multiple of 16MB, was 234217728 @@ -103,18 +103,18 @@ rec { # https://gitlab.com/odfplugfest/xmlmirror/issues/11 sed -e "s/-o fastXmlLint.js/-s EXTRA_EXPORTED_RUNTIME_METHODS='[\"ccall\", \"cwrap\"]' -o fastXmlLint.js/g" -i Makefile.emEnv ''; - + buildPhase = '' HOME=$TMPDIR make -f Makefile.emEnv ''; - + outputs = [ "out" "doc" ]; - + installPhase = '' mkdir -p $out/share mkdir -p $doc/share/${pname} - + cp Demo* $out/share cp -R codemirror-5.12 $out/share cp fastXmlLint.js* $out/share @@ -127,14 +127,13 @@ rec { cp README.md $doc/share/${pname} ''; checkPhase = '' - ''; - }; + }; zlib = (pkgs.zlib.override { stdenv = pkgs.emscriptenStdenv; }).overrideDerivation - (old: { + (old: { buildInputs = old.buildInputs ++ [ pkg-config ]; # we need to reset this setting! NIX_CFLAGS_COMPILE=""; @@ -165,7 +164,7 @@ rec { -L. libz.so.${old.version} -I . -o example.js echo "Using node to execute the test" - ${pkgs.nodejs}/bin/node ./example.js + ${pkgs.nodejs}/bin/node ./example.js set +x if [ $? -ne 0 ]; then @@ -183,6 +182,6 @@ rec { --replace 'AR="libtool"' 'AR="ar"' \ --replace 'ARFLAGS="-o"' 'ARFLAGS="-r"' ''; - }); - + }); + } |