diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2021-10-29 02:15:40 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2021-10-29 02:18:10 +0200 |
commit | 83fdaff9f71276d8e0b93263e2e05e1079cbabdb (patch) | |
tree | 53e3610fd65448917a526e0fabd855607bdd5289 /pkgs/tools/misc/sharedown/default.nix | |
parent | 848b4f463eb26a91dc15de8b6167a7d108c00e9e (diff) | |
download | nixpkgs-83fdaff9f71276d8e0b93263e2e05e1079cbabdb.tar nixpkgs-83fdaff9f71276d8e0b93263e2e05e1079cbabdb.tar.gz nixpkgs-83fdaff9f71276d8e0b93263e2e05e1079cbabdb.tar.bz2 nixpkgs-83fdaff9f71276d8e0b93263e2e05e1079cbabdb.tar.lz nixpkgs-83fdaff9f71276d8e0b93263e2e05e1079cbabdb.tar.xz nixpkgs-83fdaff9f71276d8e0b93263e2e05e1079cbabdb.tar.zst nixpkgs-83fdaff9f71276d8e0b93263e2e05e1079cbabdb.zip |
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.
Diffstat (limited to 'pkgs/tools/misc/sharedown/default.nix')
-rw-r--r-- | pkgs/tools/misc/sharedown/default.nix | 81 |
1 files changed, 40 insertions, 41 deletions
diff --git a/pkgs/tools/misc/sharedown/default.nix b/pkgs/tools/misc/sharedown/default.nix index fed2a826459..0dd4c230566 100644 --- a/pkgs/tools/misc/sharedown/default.nix +++ b/pkgs/tools/misc/sharedown/default.nix @@ -11,12 +11,7 @@ , chromium }: -let - binPath = lib.makeBinPath ([ - ffmpeg - yt-dlp - ]); - +stdenvNoCC.mkDerivation rec { pname = "Sharedown"; version = "2.0.0"; @@ -27,22 +22,6 @@ let sha256 = "sha256-Z6OsZvVzk//qEkl4ciNz4cQRqC2GFg0qYgmliAyz6fo="; }; - modules = yarn2nix-moretea.mkYarnModules { - name = "${pname}-modules-${version}"; - inherit pname version; - - yarnFlags = yarn2nix-moretea.defaultYarnFlags ++ [ - "--production" - ]; - - packageJSON = "${src}/package.json"; - yarnLock = ./yarn.lock; - yarnNix = ./yarndeps.nix; - }; -in -stdenvNoCC.mkDerivation rec { - inherit pname version src; - nativeBuildInputs = [ copyDesktopItems makeWrapper @@ -61,25 +40,45 @@ stdenvNoCC.mkDerivation rec { dontBuild = true; - installPhase = '' - runHook preInstall - - mkdir -p "$out/bin" "$out/share/Sharedown" "$out/share/applications" "$out/share/icons/hicolor/512x512/apps" - - # Electron app - cp -r *.js *.json sharedownlogo.png sharedown "${modules}/node_modules" "$out/share/Sharedown" - - # Desktop Launcher - cp build/icon.png "$out/share/icons/hicolor/512x512/apps/Sharedown.png" - - # Install electron wrapper script - makeWrapper "${electron}/bin/electron" "$out/bin/Sharedown" \ - --add-flags "$out/share/Sharedown" \ - --prefix PATH : "${binPath}" \ - --set PUPPETEER_EXECUTABLE_PATH "${chromium}/bin/chromium" - - runHook postInstall - ''; + installPhase = + let + binPath = lib.makeBinPath ([ + ffmpeg + yt-dlp + ]); + + modules = yarn2nix-moretea.mkYarnModules { + name = "${pname}-modules-${version}"; + inherit pname version; + + yarnFlags = yarn2nix-moretea.defaultYarnFlags ++ [ + "--production" + ]; + + packageJSON = "${src}/package.json"; + yarnLock = ./yarn.lock; + yarnNix = ./yarndeps.nix; + }; + in + '' + runHook preInstall + + mkdir -p "$out/bin" "$out/share/Sharedown" "$out/share/applications" "$out/share/icons/hicolor/512x512/apps" + + # Electron app + cp -r *.js *.json sharedownlogo.png sharedown "${modules}/node_modules" "$out/share/Sharedown" + + # Desktop Launcher + cp build/icon.png "$out/share/icons/hicolor/512x512/apps/Sharedown.png" + + # Install electron wrapper script + makeWrapper "${electron}/bin/electron" "$out/bin/Sharedown" \ + --add-flags "$out/share/Sharedown" \ + --prefix PATH : "${binPath}" \ + --set PUPPETEER_EXECUTABLE_PATH "${chromium}/bin/chromium" + + runHook postInstall + ''; passthru.updateScript = ./update.sh; |