From 6ee7f3383386f56ede19eace321e431b22a3af3a Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 19 Aug 2021 22:49:29 +0200 Subject: yarn2nix: replace simple mkDerivation with runCommandLocal --- .../tools/yarn2nix-moretea/yarn2nix/default.nix | 27 +++++++++------------- 1 file changed, 11 insertions(+), 16 deletions(-) (limited to 'pkgs/development/tools/yarn2nix-moretea/yarn2nix') diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix index 0822e1ee63986..cba0227fd1fa0 100644 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix @@ -4,7 +4,7 @@ }: let - inherit (pkgs) stdenv lib fetchurl linkFarm callPackage git rsync makeWrapper; + inherit (pkgs) stdenv lib fetchurl linkFarm callPackage git rsync makeWrapper runCommandLocal; compose = f: g: x: f (g x); id = x: x; @@ -414,21 +414,16 @@ in rec { ''; }; - fixup_yarn_lock = stdenv.mkDerivation { - name = "fixup_yarn_lock"; + fixup_yarn_lock = runCommandLocal "fixup_yarn_lock" + { + buildInputs = [ nodejs ]; + } '' + mkdir -p $out/lib + mkdir -p $out/bin - buildInputs = [ nodejs ]; + cp ${./lib/urlToName.js} $out/lib/urlToName.js + cp ${./internal/fixup_yarn_lock.js} $out/bin/fixup_yarn_lock - phases = [ "installPhase" ]; - - installPhase = '' - mkdir -p $out/lib - mkdir -p $out/bin - - cp ${./lib/urlToName.js} $out/lib/urlToName.js - cp ${./internal/fixup_yarn_lock.js} $out/bin/fixup_yarn_lock - - patchShebangs $out - ''; - }; + patchShebangs $out + ''; } -- cgit 1.4.1