colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

nixpatches: fold the whalebird stuff together to match github PR

Browse Source
This commit is contained in:
colin
2022-06-05 21:25:58 -07:00
parent 7de4160121
commit 6eff3e8f11
3 changed files with 14 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
flake.nix
View File

@@ -53,12 +53,10 @@
# for raspberry pi: allow building u-boot for rpi 4{,00} # for raspberry pi: allow building u-boot for rpi 4{,00}
# TODO: remove after upstreamed: https://github.com/NixOS/nixpkgs/pull/176018 # TODO: remove after upstreamed: https://github.com/NixOS/nixpkgs/pull/176018
./nixpatches/02-rpi4-uboot.patch ./nixpatches/02-rpi4-uboot.patch
# TODO: remove after upstreamed: https://github.com/NixOS/nixpkgs/pull/176476
./nixpatches/03-whalebird-4.6.0.patch
# alternative to https://github.com/NixOS/nixpkgs/pull/173200 # alternative to https://github.com/NixOS/nixpkgs/pull/173200
./nixpatches/04-dart-2.7.0.patch ./nixpatches/04-dart-2.7.0.patch
# TODO: remove after upstreamed: https://github.com/NixOS/nixpkgs/pull/176476 # TODO: remove after upstreamed: https://github.com/NixOS/nixpkgs/pull/176476
./nixpatches/05-whalebird-aarch64.patch ./nixpatches/06-whalebird-4.6.0-aarch64.patch
]; ];
}; };
nixosSystem = import (patchedPkgs + "/nixos/lib/eval-config.nix"); nixosSystem = import (patchedPkgs + "/nixos/lib/eval-config.nix");

27
nixpatches/03-whalebird-4.6.0.patch
View File

@@ -1,27 +0,0 @@
diff --git a/pkgs/applications/misc/whalebird/default.nix b/pkgs/applications/misc/whalebird/default.nix
index 9b8a7f0a348..7170a63ac7f 100644
--- a/pkgs/applications/misc/whalebird/default.nix
+++ b/pkgs/applications/misc/whalebird/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "whalebird";
- version = "4.5.4";
+ version = "4.6.0";
src = fetchurl {
url = "https://github.com/h3poteto/whalebird-desktop/releases/download/${version}/Whalebird-${version}-linux-x64.deb";
- sha256 = "048c2hpnlzjli8r1lcm7hd32qfsq4p9vkimrgc049yw9f15ndjpr";
+ sha256 = "d8042eb21e4320771782a1835a591252894ad657eec46248c807d5a772e1938e";
};
nativeBuildInputs = [
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
# Necessary steps to find the tray icon
asar extract opt/Whalebird/resources/app.asar "$TMP/work"
substituteInPlace $TMP/work/dist/electron/main.js \
- --replace "jo,\"tray_icon.png\"" "\"$out/opt/Whalebird/resources/build/icons/tray_icon.png\""
+ --replace "Do,\"tray_icon.png\"" "\"$out/opt/Whalebird/resources/build/icons/tray_icon.png\""
asar pack --unpack='{*.node,*.ftz,rect-overlay}' "$TMP/work" opt/Whalebird/resources/app.asar
runHook postBuild

16
nixpatches/05-whalebird-aarch64.patch → nixpatches/06-whalebird-4.6.0-aarch64.patch
View File

@@ -1,5 +1,5 @@
diff --git a/pkgs/applications/misc/whalebird/default.nix b/pkgs/applications/misc/whalebird/default.nix diff --git a/pkgs/applications/misc/whalebird/default.nix b/pkgs/applications/misc/whalebird/default.nix
index 7170a63ac7f..dcd88fb9a8b 100644 index 9b8a7f0a348..dcd88fb9a8b 100644
--- a/pkgs/applications/misc/whalebird/default.nix --- a/pkgs/applications/misc/whalebird/default.nix
+++ b/pkgs/applications/misc/whalebird/default.nix +++ b/pkgs/applications/misc/whalebird/default.nix
@@ -1,17 +1,35 @@ @@ -1,17 +1,35 @@
@@ -19,11 +19,12 @@ index 7170a63ac7f..dcd88fb9a8b 100644
+in +in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "whalebird"; pname = "whalebird";
version = "4.6.0"; - version = "4.5.4";
+ version = "4.6.0";
- src = fetchurl { - src = fetchurl {
- url = "https://github.com/h3poteto/whalebird-desktop/releases/download/${version}/Whalebird-${version}-linux-x64.deb"; - url = "https://github.com/h3poteto/whalebird-desktop/releases/download/${version}/Whalebird-${version}-linux-x64.deb";
- sha256 = "d8042eb21e4320771782a1835a591252894ad657eec46248c807d5a772e1938e"; - sha256 = "048c2hpnlzjli8r1lcm7hd32qfsq4p9vkimrgc049yw9f15ndjpr";
- }; - };
+ src = let + src = let
+ downloads = "https://github.com/h3poteto/whalebird-desktop/releases/download/${version}"; + downloads = "https://github.com/h3poteto/whalebird-desktop/releases/download/${version}";
@@ -59,6 +60,15 @@ index 7170a63ac7f..dcd88fb9a8b 100644
''; '';
buildPhase = '' buildPhase = ''
@@ -31,7 +50,7 @@ stdenv.mkDerivation rec {
# Necessary steps to find the tray icon
asar extract opt/Whalebird/resources/app.asar "$TMP/work"
substituteInPlace $TMP/work/dist/electron/main.js \
- --replace "jo,\"tray_icon.png\"" "\"$out/opt/Whalebird/resources/build/icons/tray_icon.png\""
+ --replace "Do,\"tray_icon.png\"" "\"$out/opt/Whalebird/resources/build/icons/tray_icon.png\""
asar pack --unpack='{*.node,*.ftz,rect-overlay}' "$TMP/work" opt/Whalebird/resources/app.asar
runHook postBuild
@@ -41,12 +60,23 @@ stdenv.mkDerivation rec { @@ -41,12 +60,23 @@ stdenv.mkDerivation rec {
runHook preInstall runHook preInstall