commit 227d978ef1ee20de76ccf18e09a82015e6663b8b · pyrox.dev/nixpkgs

+35 -44

pkgs/applications/misc/whalebird/default.nix

···

       5
       5
        
         makeDesktopItem,

     

       6
       6
        
         copyDesktopItems,

     

       7
       7
        
         makeWrapper,

     

       8
       8
       -
         electron,

     

       9
       9
       -
         cacert,

     

       10
       10
       -
         gitMinimal,

     

       11
       11
       -
         yarn,

     

       8
       8
       +
         electron_37,

     

       9
       9
       +
         yarn-berry,

     

       10
       10
       +
         writableTmpDirAsHomeHook,

     

       12
       11
        
       }:

     

       13
       13
       -
       stdenv.mkDerivation rec {

     

       12
       12
       +
       

     

       13
       13
       +
       let

     

       14
       14
       +
         electron = electron_37;

     

       15
       15
       +
       in

     

       16
       16
       +
       stdenv.mkDerivation (finalAttrs: {

     

       14
       17
        
         pname = "whalebird";

     

       15
       15
       -
         version = "6.2.2-unstable-2025-06-12";

     

       18
       18
       +
         version = "6.2.4";

     

       16
       19
        
       

     

       17
       20
        
         src = fetchFromGitHub {

     

       18
       21
        
           owner = "h3poteto";

     

       19
       22
        
           repo = "whalebird-desktop";

     

       20
       20
       -
           rev = "506a1ff00188f04bffeaede0110719512c621b02";

     

       21
       21
       -
           hash = "sha256-jkdGwdNcF4Rbivi0TziW/ZOficbXIrxqaB+kQrNcdsc=";

     

       23
       23
       +
           tag = "v${finalAttrs.version}";

     

       24
       24
       +
           hash = "sha256-0wXfyRmCDkirYgSXUuvrIkQ2yRnVRWMoyyqifIF5VU4=";

     

       22
       25
        
         };

     

       23
       23
       -
         # we cannot use fetchYarnDeps because that doesn't support yarn 2/berry lockfiles

     

       24
       24
       -
         offlineCache = stdenv.mkDerivation {

     

       25
       25
       -
           name = "whalebird-${version}-offline-cache";

     

       26
       26
       -
           inherit src;

     

       27
       26
        
       

     

       28
       28
       -
           nativeBuildInputs = [

     

       29
       29
       -
             cacert # needed for git

     

       30
       30
       -
             gitMinimal # needed to download git dependencies

     

       31
       31
       -
             yarn

     

       32
       32
       -
           ];

     

       27
       27
       +
         missingHashes = ./missing-hashes.json;

     

       33
       28
        
       

     

       34
       34
       -
           buildPhase = ''

     

       35
       35
       -
             export HOME=$(mktemp -d)

     

       36
       36
       -
             yarn config set enableTelemetry 0

     

       37
       37
       -
             yarn config set cacheFolder $out

     

       38
       38
       -
             yarn config set --json supportedArchitectures.os '[ "linux" ]'

     

       39
       39
       -
             yarn config set --json supportedArchitectures.cpu '[ "arm64", "x64" ]'

     

       40
       40
       -
             yarn

     

       41
       41
       -
           '';

     

       29
       29
       +
         offlineCache = yarn-berry.fetchYarnBerryDeps {

     

       30
       30
       +
           inherit (finalAttrs) src missingHashes;

     

       31
       31
       +
           hash = "sha256-vwSVd+ttQFeXEsRsh9jmHKouyqkHeosy0Z/LMb4pzeI=";

     

       32
       32
       +
         };

     

       42
       33
        
       

     

       43
       43
       -
           outputHashMode = "recursive";

     

       44
       44
       -
           outputHash = "sha256-Lru6utVP1uHpHvL8Jg/JzEnIErsxVo7njJhsqkThktk=";

     

       45
       45
       -
         };

     

       34
       34
       +
         postPatch = ''

     

       35
       35
       +
           sed -i "/module.exports = {/a \  typescript: {\n    ignoreBuildErrors: true,\n  }," renderer/next.config.js

     

       36
       36
       +
         '';

     

       46
       37
        
       

     

       47
       38
        
         nativeBuildInputs = [

     

       48
       39
        
           makeWrapper

     

       49
       40
        
           copyDesktopItems

     

       50
       50
       -
           yarn

     

       41
       41
       +
           yarn-berry

     

       42
       42
       +
           yarn-berry.yarnBerryConfigHook

     

       43
       43
       +
           writableTmpDirAsHomeHook

     

       51
       44
        
         ];

     

       52
       45
        
       

     

       53
       46
        
         desktopItems = [

     

       54
       47
        
           (makeDesktopItem {

     

       55
       48
        
             desktopName = "Whalebird";

     

       56
       56
       -
             comment = meta.description;

     

       49
       49
       +
             comment = finalAttrs.meta.description;

     

       57
       50
        
             categories = [ "Network" ];

     

       58
       51
        
             exec = "whalebird";

     

       59
       52
        
             icon = "whalebird";

     
···

       61
       54
        
           })

     

       62
       55
        
         ];

     

       63
       56
        
       

     

       64
       64
       -
         ELECTRON_SKIP_BINARY_DOWNLOAD = "1";

     

       57
       57
       +
         env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";

     

       65
       58
        
       

     

       66
       59
        
         buildPhase = ''

     

       67
       60
        
           runHook preBuild

     

       68
       61
        
       

     

       69
       69
       -
           export HOME=$(mktemp -d)

     

       70
       70
       -
           yarn config set enableTelemetry 0

     

       71
       71
       -
           yarn config set cacheFolder ${offlineCache}

     

       72
       72
       -
       

     

       73
       73
       -
           yarn --immutable-cache

     

       74
       74
       -
           yarn run nextron build --no-pack

     

       75
       75
       -
           yarn run electron-builder --dir \

     

       62
       62
       +
           yarn exec nextron build --no-pack

     

       63
       63
       +
           yarn exec electron-builder --dir \

     

       64
       64
       +
             --linux \

     

       65
       65
       +
             -p never \

     

       76
       66
        
             --config electron-builder.yml \

     

       77
       67
        
             -c.electronDist="${electron.dist}" \

     

       78
       68
        
             -c.electronVersion=${electron.version}

     
···

       85
       75
        
       

     

       86
       76
        
           mkdir -p $out/opt

     

       87
       77
        
           cp -r ./dist/*-unpacked $out/opt/Whalebird

     

       88
       88
       -
       

     

       89
       89
       -
           # Install icons

     

       90
       90
       -
           # Taken from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=whalebird#n41

     

       78
       78
       +
         ''

     

       79
       79
       +
         # Install icons

     

       80
       80
       +
         # Taken from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=whalebird#n41

     

       81
       81
       +
         + ''

     

       91
       82
        
           for i in 16 32 128 256 512; do

     

       92
       83
        
             install -Dm644 "resources/icons/icon.iconset/icon_$i"x"$i.png" \

     

       93
       84
        
               "$out/share/icons/hicolor/$i"x"$i/apps/whalebird.png"

     
···

       97
       88
        
       

     

       98
       89
        
           makeWrapper "${electron}/bin/electron" "$out/bin/whalebird" \

     

       99
       90
        
             --add-flags "$out/opt/Whalebird/resources/app.asar" \

     

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

     

       91
       91
       +
             --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true --wayland-text-input-version=3}}"

     

       101
       92
        
       

     

       102
       93
        
           runHook postInstall

     

       103
       94
        
         '';

     
···

       106
       97
        
           description = "Single-column Fediverse client for desktop";

     

       107
       98
        
           mainProgram = "whalebird";

     

       108
       99
        
           homepage = "https://whalebird.social";

     

       109
       109
       -
           changelog = "https://github.com/h3poteto/whalebird-desktop/releases/tag/v${version}";

     

       100
       100
       +
           changelog = "https://github.com/h3poteto/whalebird-desktop/releases/tag/v${finalAttrs.version}";

     

       110
       101
        
           license = lib.licenses.gpl3Only;

     

       111
       102
        
           maintainers = with lib.maintainers; [ weathercold ];

     

       112
       103
        
           platforms = [

     
···

       114
       105
        
             "aarch64-linux"

     

       115
       106
        
           ];

     

       116
       107
        
         };

     

       117
       117
       -
       }

     

       108
       108
       +
       })

+26

pkgs/applications/misc/whalebird/missing-hashes.json

···

       1
       1
       +
       {

     

       2
       2
       +
           "@next/swc-darwin-arm64@npm:14.2.29": "34800ea408d4025e6dd87e9b9b14ffff8c881cd3566f23f71dccaf9be3c7637a040fe5d5192970f04bc66630415c208856d129800ac017dc03978bb6c4211892",

     

       3
       3
       +
           "@next/swc-darwin-x64@npm:14.2.29": "608a86eaff1a683464eda5bab2877a9a51cd0b3b5b28cc9ff0978a940c887451feb1e4da46d509c1a75e125e367214015e895180b2cd3600b90a6db2a66849e6",

     

       4
       4
       +
           "@next/swc-linux-arm64-gnu@npm:14.2.29": "2b6dcbfeb9952cd8217503becf73b6899611f8301bbd3ebb5da14f209022fe8dfbeda8724e698c76bd14bcd8db3e58a7abd65d943806b0339502e66d8869ed1c",

     

       5
       5
       +
           "@next/swc-linux-arm64-musl@npm:14.2.29": "8fa07a16776a7a9ba70fb08540494b02874dff066af67010fc8681e8eedf0c9c3d2199719a1629dae55d487bb9143843772a39e32472b435512546013dd25bc1",

     

       6
       6
       +
           "@next/swc-linux-x64-gnu@npm:14.2.29": "0172a1d5b75d84109a500abb4ea1d2827ec9e71ba3b3101b5899380cf1ec6aa7919922027cb0e288cd31de5f5bb04da4b9ce2897a9e1273be6105d0283bbf750",

     

       7
       7
       +
           "@next/swc-linux-x64-musl@npm:14.2.29": "fea65e83d1d2b06f5f00c41f26919cd8db94372f7faf57f515ba882936adde2f6b42e5da0db88681a91326ab90454561afdcb41185be5d6bb9e0309d55aa3d8a",

     

       8
       8
       +
           "@next/swc-win32-arm64-msvc@npm:14.2.29": "143a5751877a4475ff06e24d8c5c98db1515ddc8cb04dd62ad4d657ca856766ed39793243169961b0b68db5454c2220b23e17e9dd12c9dee66a637943624249e",

     

       9
       9
       +
           "@next/swc-win32-ia32-msvc@npm:14.2.29": "a77da58ed7352144ad9d1929d2356898d6aebfdafa5796b8381900ebd25e7faa1dfdf4e8ce4b1aa056aa459941ee61a0c59eb1b871d1f39d24405e9d46592070",

     

       10
       10
       +
           "@next/swc-win32-x64-msvc@npm:14.2.29": "35a492be5e597bfed81eca677321ba37676b271dcd5c47d2e1411c3310bed485fdeeaee303da41dc194d18394d4053667fe7e3ba02e7e327dae9f99a1b19b743",

     

       11
       11
       +
           "@parcel/watcher-android-arm64@npm:2.5.0": "aaa9d1cae932f081e331f506200c9d4dd8ceaebfbbfbc5868f7c76cf4b7259403e9c8128ee26a68d24cc4ca6f5f683830f4895f8aa8eb014e9582a5af0c608e1",

     

       12
       12
       +
           "@parcel/watcher-darwin-arm64@npm:2.5.0": "3b43e993a3f5a68c48a2a80302443ab079ca380d94d11c09ec731bc0aa74776bf9e1360e8371850ebae136f317f62a7d546c7e53de315ea3fd5d3ffa3bf5d690",

     

       13
       13
       +
           "@parcel/watcher-darwin-x64@npm:2.5.0": "ff642c65a251be601b9ed72618956a4cb6cac8ffed5db1eaceab2607ee74d0161b9f15c333b3b8d440526ea5795f3ef762cf4e3bf26f21a3f82fe8e4bec7dd9f",

     

       14
       14
       +
           "@parcel/watcher-freebsd-x64@npm:2.5.0": "33ce8bce2afe0a4dacba9aadf322346292a5a80f79ffb49f2ba1f9ed13a8124e10f8fac5eff6e556f956077404c68834d40fbbb52e351f90c9c459d51be67bec",

     

       15
       15
       +
           "@parcel/watcher-linux-arm-glibc@npm:2.5.0": "fff5f8f1628bdfcd8fd5ec6567ef544b9377b34a7bf42bf7c65cd6f66835e77d7c09a395576ca1e7e1c59a9de5499d88b7e61f3cf28cd4f18bd3507ddf3ba083",

     

       16
       16
       +
           "@parcel/watcher-linux-arm-musl@npm:2.5.0": "d40314d3e4e3381df0e33e4aeafa398ad7d1e0ed553b1aa3fbfeda6868041070ca3998caaa8f82e8549db8c6276e7532c0e18c21bc616c5c166ef38c0a1d0ab9",

     

       17
       17
       +
           "@parcel/watcher-linux-arm64-glibc@npm:2.5.0": "2ac244de308be96dda7e080aa57cfd35ca90c4ecd27992c291e8428c5d343e77f2e30872306d1493171687143bbe9a61a3ba4cbb500002a4931fc4ccc52363fa",

     

       18
       18
       +
           "@parcel/watcher-linux-arm64-musl@npm:2.5.0": "7b233f9e19358f41ecbf1ca5d5ef003435b88689c4cbd56cf9e31d1cfb34647fde38e333fb07b997fb3908878a898043bbc725c9483fe2d1a93c17a0d4527f93",

     

       19
       19
       +
           "@parcel/watcher-linux-x64-glibc@npm:2.5.0": "9797ab32ac241966b5396e95b9489d912c905b863ca42a964373d73db59e594d020810a1784b76b8b456018bb5774d43a778f0c33083ba0ada4c5a11cf7855e6",

     

       20
       20
       +
           "@parcel/watcher-linux-x64-musl@npm:2.5.0": "42a75104cae0fb6f208d644ee16a0f21e8cb3b288ff041899eda116f475f07a657427439b1c9e2d1318806c42cb0c0e342df6b87f9e0e00d2bbbf4df041122bf",

     

       21
       21
       +
           "@parcel/watcher-win32-arm64@npm:2.5.0": "bc7e902a2e26824d9bfce9bd16de997d3ae900b03433b70f24eaff264a9279910e1a430eb77b07a72597494ecfa89bd87fe4b7c10e3169c51ccc7b9ebc813e3e",

     

       22
       22
       +
           "@parcel/watcher-win32-ia32@npm:2.5.0": "915963497eb35a1a3e71a1b8d1aac851d231743955b53c8a7eaf2cb77dec99a21a285397349dd6a488e6305c01311b57ee1bae897ee7016c0d40fceaf2b2af16",

     

       23
       23
       +
           "@parcel/watcher-win32-x64@npm:2.5.0": "fd764a09afa89a5e0e50eb610920cf4982b1cb3ec04ca68348c0503b66af6eefd4942f1130276b928d94be6699d72607a46fab9586a800a4394eee05ee1b7b4c",

     

       24
       24
       +
           "dmg-license@npm:1.0.11": "36c0a7b030801b91216affa9b2bb00caa345b2327f298accb2263a80a0320ca305f90b99da68007d187c830c543410d58a0a2bbc229e8d169b0e1d1652ff42aa",

     

       25
       25
       +
           "iconv-corefoundation@npm:1.1.7": "0189733ef51a9f481379202cb1919f2677efc44aa014ba662a6fd99e47993e350eab0ff724ed18cda8011c9b78c4702b2d374f732955f1def3fd2a14a29d25c0"

     

       26
       26
       +
       }

+1 -3

pkgs/top-level/all-packages.nix

···

       13571
       13571
        
           xwaylandSupport = false;

     

       13572
       13572
        
         };

     

       13573
       13573
        
       

     

       13574
       13574
       -
         whalebird = callPackage ../applications/misc/whalebird {

     

       13575
       13575
       -
           electron = electron_36;

     

       13576
       13576
       -
         };

     

       13574
       13574
       +
         whalebird = callPackage ../applications/misc/whalebird { };

     

       13577
       13575
        
       

     

       13578
       13576
        
         inherit (windowmaker) dockapps;

     

       13579
       13577