Commit 83fdaff9 authored by Jan Tojnar's avatar Jan Tojnar
Browse files

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.
parent 848b4f46

pkgs/tools/misc/sharedown/default.nix

+40 −41
Original line number Diff line number Diff line
@@ -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,7 +40,27 @@ stdenvNoCC.mkDerivation rec { 


  dontBuild = true;



  installPhase = ''

  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"