lol

sharedown: Improve expression formatting

The old formatting made it far too easy to add patches attribute to the let binding instead of passing it to the derivation.

+35 -36
+35 -36
pkgs/tools/misc/sharedown/default.nix
··· 11 11 , chromium 12 12 }: 13 13 14 - let 15 - binPath = lib.makeBinPath ([ 16 - ffmpeg 17 - yt-dlp 18 - ]); 19 - 14 + stdenvNoCC.mkDerivation rec { 20 15 pname = "Sharedown"; 21 16 version = "2.0.0"; 22 17 ··· 27 22 sha256 = "sha256-Z6OsZvVzk//qEkl4ciNz4cQRqC2GFg0qYgmliAyz6fo="; 28 23 }; 29 24 30 - modules = yarn2nix-moretea.mkYarnModules { 31 - name = "${pname}-modules-${version}"; 32 - inherit pname version; 33 - 34 - yarnFlags = yarn2nix-moretea.defaultYarnFlags ++ [ 35 - "--production" 36 - ]; 37 - 38 - packageJSON = "${src}/package.json"; 39 - yarnLock = ./yarn.lock; 40 - yarnNix = ./yarndeps.nix; 41 - }; 42 - in 43 - stdenvNoCC.mkDerivation rec { 44 - inherit pname version src; 45 - 46 25 nativeBuildInputs = [ 47 26 copyDesktopItems 48 27 makeWrapper ··· 61 40 62 41 dontBuild = true; 63 42 64 - installPhase = '' 65 - runHook preInstall 43 + installPhase = 44 + let 45 + binPath = lib.makeBinPath ([ 46 + ffmpeg 47 + yt-dlp 48 + ]); 49 + 50 + modules = yarn2nix-moretea.mkYarnModules { 51 + name = "${pname}-modules-${version}"; 52 + inherit pname version; 53 + 54 + yarnFlags = yarn2nix-moretea.defaultYarnFlags ++ [ 55 + "--production" 56 + ]; 66 57 67 - mkdir -p "$out/bin" "$out/share/Sharedown" "$out/share/applications" "$out/share/icons/hicolor/512x512/apps" 58 + packageJSON = "${src}/package.json"; 59 + yarnLock = ./yarn.lock; 60 + yarnNix = ./yarndeps.nix; 61 + }; 62 + in 63 + '' 64 + runHook preInstall 68 65 69 - # Electron app 70 - cp -r *.js *.json sharedownlogo.png sharedown "${modules}/node_modules" "$out/share/Sharedown" 66 + mkdir -p "$out/bin" "$out/share/Sharedown" "$out/share/applications" "$out/share/icons/hicolor/512x512/apps" 67 + 68 + # Electron app 69 + cp -r *.js *.json sharedownlogo.png sharedown "${modules}/node_modules" "$out/share/Sharedown" 71 70 72 - # Desktop Launcher 73 - cp build/icon.png "$out/share/icons/hicolor/512x512/apps/Sharedown.png" 71 + # Desktop Launcher 72 + cp build/icon.png "$out/share/icons/hicolor/512x512/apps/Sharedown.png" 74 73 75 - # Install electron wrapper script 76 - makeWrapper "${electron}/bin/electron" "$out/bin/Sharedown" \ 77 - --add-flags "$out/share/Sharedown" \ 78 - --prefix PATH : "${binPath}" \ 79 - --set PUPPETEER_EXECUTABLE_PATH "${chromium}/bin/chromium" 74 + # Install electron wrapper script 75 + makeWrapper "${electron}/bin/electron" "$out/bin/Sharedown" \ 76 + --add-flags "$out/share/Sharedown" \ 77 + --prefix PATH : "${binPath}" \ 78 + --set PUPPETEER_EXECUTABLE_PATH "${chromium}/bin/chromium" 80 79 81 - runHook postInstall 82 - ''; 80 + runHook postInstall 81 + ''; 83 82 84 83 passthru.updateScript = ./update.sh; 85 84