From 92597f9ed62868944eac0a3d5068cb25337b7d39 Mon Sep 17 00:00:00 2001 From: Al McElrath Date: Mon, 19 Jan 2026 22:42:11 -0800 Subject: [PATCH] freetube: fix darwin --- pkgs/by-name/fr/freetube/darwin-targets.patch | 13 +++++++++++++ pkgs/by-name/fr/freetube/package.nix | 12 ++++-------- 2 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 pkgs/by-name/fr/freetube/darwin-targets.patch diff --git a/pkgs/by-name/fr/freetube/darwin-targets.patch b/pkgs/by-name/fr/freetube/darwin-targets.patch new file mode 100644 index 000000000000..509bca6a34cd --- /dev/null +++ b/pkgs/by-name/fr/freetube/darwin-targets.patch @@ -0,0 +1,13 @@ +diff --git a/_scripts/build.js b/_scripts/build.js +index ee1b7fa1c..1a4c9c6b2 100644 +--- a/_scripts/build.js ++++ b/_scripts/build.js +@@ -16,7 +16,7 @@ if (platform === 'darwin') { + arch = Arch.arm64 + } + +- targets = Platform.MAC.createTarget(['DMG', 'zip', '7z'], arch) ++ targets = Platform.MAC.createTarget(['dir'], arch) + } else if (platform === 'win32') { + let arch = Arch.x64 + diff --git a/pkgs/by-name/fr/freetube/package.nix b/pkgs/by-name/fr/freetube/package.nix index 26ed6654cbb2..539e54b68cb3 100644 --- a/pkgs/by-name/fr/freetube/package.nix +++ b/pkgs/by-name/fr/freetube/package.nix @@ -33,8 +33,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { postUnpack = if stdenvNoCC.hostPlatform.isDarwin then '' - cp -r ${electron.dist} electron-dist - chmod -R u+w electron-dist + cp -r ${electron.dist} source/electron-dist + chmod -R u+w source/electron-dist '' else '' @@ -45,6 +45,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { (replaceVars ./patch-build-script.patch { electron-version = electron.version; }) + ./darwin-targets.patch ]; yarnOfflineCache = fetchYarnDeps { @@ -74,7 +75,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { install -D _icons/icon.svg $out/share/icons/hicolor/scalable/apps/freetube.svg '' + lib.optionalString stdenvNoCC.hostPlatform.isDarwin '' - mkdir -p $out/Applications + mkdir -p $out/Applications $out/bin cp -r build/mac*/FreeTube.app $out/Applications ln -s "$out/Applications/FreeTube.app/Contents/MacOS/FreeTube" $out/bin/freetube '' @@ -110,11 +111,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { sigmasquadron ddogfoodd ]; - badPlatforms = [ - # output app is called "Electron.app" while derivation expects "FreeTube.app" - #see: https://github.com/NixOS/nixpkgs/pull/384596#issuecomment-2677141349 - lib.systems.inspect.patterns.isDarwin - ]; inherit (electron.meta) platforms; mainProgram = "freetube"; };