Unverified Commit fb0d6610 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by Lily Foster
Browse files

treewide: replace prefetch-yarn-deps with fixup-yarn-lock where necessary

parent 6181939c

pkgs/applications/audio/muzika/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
, desktop-file-utils

, fetchFromGitHub

, fetchYarnDeps

, prefetch-yarn-deps

, fixup-yarn-lock

, gjs

, glib-networking

, gobject-introspection
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec { 
    ninja

    nodejs

    pkg-config

    prefetch-yarn-deps

    fixup-yarn-lock

    wrapGAppsHook4

    yarn

  ];

pkgs/applications/graphics/drawio/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
, fetchYarnDeps

, makeDesktopItem

, copyDesktopItems

, prefetch-yarn-deps

, fixup-yarn-lock

, makeWrapper

, autoSignDarwinBinariesHook

, nodejs
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec { 
  };



  nativeBuildInputs = [

    prefetch-yarn-deps

    fixup-yarn-lock

    makeWrapper

    nodejs

    yarn

pkgs/applications/misc/tandoor-recipes/frontend.nix

+2 −2
Original line number Diff line number Diff line 
{ stdenv, fetchYarnDeps, prefetch-yarn-deps, callPackage, nodejs }:

{ stdenv, fetchYarnDeps, fixup-yarn-lock, callPackage, nodejs }:

let

  common = callPackage ./common.nix { };

in
@@ -14,7 +14,7 @@ stdenv.mkDerivation { 
  };



  nativeBuildInputs = [

    prefetch-yarn-deps

    fixup-yarn-lock

    nodejs

    nodejs.pkgs.yarn

  ];

pkgs/applications/networking/cluster/tilt/assets.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
, stdenvNoCC

, version, src

, fetchYarnDeps

, prefetch-yarn-deps, yarn, nodejs

, fixup-yarn-lock, yarn, nodejs

}:



stdenvNoCC.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenvNoCC.mkDerivation rec { 


  inherit src version;



  nativeBuildInputs = [ prefetch-yarn-deps yarn nodejs ];

  nativeBuildInputs = [ fixup-yarn-lock yarn nodejs ];



  yarnOfflineCache = fetchYarnDeps {

    yarnLock = "${src}/web/yarn.lock";

pkgs/applications/networking/instant-messengers/element/element-desktop.nix

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
, fetchFromGitHub

, makeWrapper

, makeDesktopItem

, prefetch-yarn-deps

, fixup-yarn-lock

, yarn

, nodejs

, fetchYarnDeps
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { 
    sha256 = desktopYarnHash;

  };



  nativeBuildInputs = [ yarn prefetch-yarn-deps nodejs makeWrapper jq ]

  nativeBuildInputs = [ yarn fixup-yarn-lock nodejs makeWrapper jq ]

    ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ];



  inherit seshat;