Unverified Commit 217fa347 authored by Fernando Rodrigues's avatar Fernando Rodrigues Committed by GitHub
Browse files

freetube: 0.23.15 -> 0.24.0 (#505648)

parents f96f2228 208a7d47

pkgs/by-name/fr/freetube/package.nix

+5 −5
Original line number Diff line number Diff line
@@ -20,13 +20,13 @@ let 
in

stdenvNoCC.mkDerivation (finalAttrs: {

  pname = "freetube";

  version = "0.23.15";

  version = "0.24.0";



  src = fetchFromGitHub {

    owner = "FreeTubeApp";

    repo = "FreeTube";

    tag = "v${finalAttrs.version}-beta";

    hash = "sha256-tYRvR75qbJwt6U4KzT9jrJjO5UznpoALqhUTDkeUlzI=";

    hash = "sha256-4XyN7ENsDwLNB/dt7pp8z0sbdmHSNIyVEHlp5GXIues=";

  };



  # Darwin requires writable Electron dist
@@ -45,12 +45,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { 
    (replaceVars ./patch-build-script.patch {

      electron-version = electron.version;

    })

    ./darwin-targets.patch

    ./targets.patch

  ];



  yarnOfflineCache = fetchYarnDeps {

    yarnLock = "${finalAttrs.src}/yarn.lock";

    hash = "sha256-sxDlPB3CWbFAm3WZ6AlwuVu/4UFR9Stl3q0wpkUXPPU=";

    hash = "sha256-9rO/XYfOf1TEQOpb5clCfdTiuDeynpnk6L4WpcIIWGk=";

  };



  nativeBuildInputs = [
@@ -70,7 +70,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { 


    makeWrapper ${lib.getExe electron} $out/bin/freetube \

      --add-flags "$out/share/freetube/resources/app.asar" \

      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"

      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"



    install -D _icons/icon.svg $out/share/icons/hicolor/scalable/apps/freetube.svg

  ''

pkgs/by-name/fr/freetube/patch-build-script.patch

+9 −9
Original line number Diff line number Diff line 
diff --git a/_scripts/ebuilder.config.js b/_scripts/ebuilder.config.js

index 14d0d9df1..c5fc569c8 100644

--- a/_scripts/ebuilder.config.js

+++ b/_scripts/ebuilder.config.js

@@ -1,6 +1,8 @@

 const { name, productName } = require('../package.json')

diff --git a/_scripts/ebuilder.config.mjs b/_scripts/ebuilder.config.mjs

index bef1f6f1d..d2ee86611 100644

--- a/_scripts/ebuilder.config.mjs

+++ b/_scripts/ebuilder.config.mjs

@@ -2,6 +2,8 @@ import packageDetails from '../package.json' with { type: 'json' }

 

 const config = {

 /** @type {import('electron-builder').Configuration} */

 export default {

+  electronVersion: "@electron-version@",

+  electronDist: "electron-dist",

   appId: `io.freetubeapp.${name}`,

   copyright: 'Copyleft © 2020-2025 freetubeapp@protonmail.com',

   appId: `io.freetubeapp.${packageDetails.name}`,

   copyright: 'Copyleft © 2020-2026 freetubeapp@protonmail.com',

   // asar: false,

pkgs/by-name/fr/freetube/darwin-targets.patch→pkgs/by-name/fr/freetube/targets.patch

+22 −0
Original line number Diff line number Diff line 
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') {

diff --git a/_scripts/build.mjs b/_scripts/build.mjs

index 1617f1ad5..b9a1de43b 100644

--- a/_scripts/build.mjs

+++ b/_scripts/build.mjs

@@ -14,7 +14,7 @@ if (platform === 'darwin') {

     arch = Arch.arm64

   }
@@ -11,3 +11,12 @@ index ee1b7fa1c..1a4c9c6b2 100644 
 } else if (platform === 'win32') {

   let arch = Arch.x64

 

@@ -34,7 +34,7 @@ if (platform === 'darwin') {

     arch = Arch.armv7l

   }

 

-  targets = Platform.LINUX.createTarget(['deb', 'zip', '7z', 'rpm', 'AppImage', 'pacman'], arch)

+  targets = Platform.LINUX.createTarget(['dir'], arch)

 }

 

 const output = await build({ targets, config, publish: 'never' })