b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

sharedown: Improve expression formatting

Browse source 
The old formatting made it far too easy to add patches attribute to the let binding instead of passing it to the derivation.
This commit is contained in:
Jan Tojnar 2021-10-29 02:15:40 +02:00
parent 848b4f463e
commit 83fdaff9f7
1 changed files with 35 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
pkgs/tools/misc/sharedown/default.nix
View file

@ -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
installPhase =
let
binPath = lib.makeBinPath ([
ffmpeg
yt-dlp
]);
mkdir -p "$out/bin" "$out/share/Sharedown" "$out/share/applications" "$out/share/icons/hicolor/512x512/apps"
modules = yarn2nix-moretea.mkYarnModules {
name = "${pname}-modules-${version}";
inherit pname version;
# Electron app
cp -r *.js *.json sharedownlogo.png sharedown "${modules}/node_modules" "$out/share/Sharedown"
yarnFlags = yarn2nix-moretea.defaultYarnFlags ++ [
"--production"
];
# Desktop Launcher
cp build/icon.png "$out/share/icons/hicolor/512x512/apps/Sharedown.png"
packageJSON = "${src}/package.json";
yarnLock = ./yarn.lock;
yarnNix = ./yarndeps.nix;
};
in
''
runHook preInstall
# 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"
mkdir -p "$out/bin" "$out/share/Sharedown" "$out/share/applications" "$out/share/icons/hicolor/512x512/apps"
runHook postInstall
'';
# 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;