nixpkgs: 0-unstable-2025-03-16 -> 0-unstable-2025-03-18
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
{ pkgs, ... }:
|
||||
{ ... }:
|
||||
{
|
||||
sane.programs.nix = {
|
||||
packageUnwrapped = pkgs.nixVersions.latest;
|
||||
# packageUnwrapped = pkgs.nixVersions.latest; #< XXX(2025-03-17): sometimes `nixVersions.latest` fails to eval T_T
|
||||
sandbox.method = null; #< TODO: sandbox ?
|
||||
env.NIXPKGS_ALLOW_UNFREE = "1"; #< FUCK OFF YOU'RE SO ANNOYING
|
||||
persist.byStore.plaintext = [
|
||||
|
||||
@@ -338,11 +338,6 @@ in with final; {
|
||||
# 2025/01/13: upstreaming is unblocked
|
||||
glycin-loaders = (prev.glycin-loaders.override {
|
||||
cargo = crossCargo;
|
||||
}).overrideAttrs (upstream: {
|
||||
nativeBuildInputs = upstream.nativeBuildInputs ++ [
|
||||
# fixes: loaders/meson.build:72:7: ERROR: Program 'msgfmt' not found or not executable
|
||||
buildPackages.gettext
|
||||
];
|
||||
});
|
||||
|
||||
# gnustep = prev.gnustep.overrideScope (self: super: {
|
||||
@@ -396,13 +391,6 @@ in with final; {
|
||||
# ];
|
||||
# });
|
||||
|
||||
# 2025/03/10: blocked on libqmi (fixed in staging)
|
||||
gtk4-layer-shell = prev.gtk4-layer-shell.overrideAttrs (upstream: {
|
||||
nativeBuildInputs = upstream.nativeBuildInputs ++ [
|
||||
buildPackages.mesonEmulatorHook
|
||||
];
|
||||
});
|
||||
|
||||
# 2025/01/13: blocked on psqlodbc
|
||||
# used by hyprland (which is an indirect dep of waybar, nwg-panel, etc),
|
||||
# which it shells out to at runtime (and hence, not ever used by me).
|
||||
@@ -642,19 +630,6 @@ in with final; {
|
||||
# # buildInputs = lib.remove gnupg upstream.buildInputs;
|
||||
# });
|
||||
|
||||
# 2025/03/17: out for PR <https://github.com/NixOS/nixpkgs/pull/390878>
|
||||
# full cross compilation is blocked on ruby though; this only works by me manually
|
||||
# overriding neovim to build w/o ruby
|
||||
# nvimpager = prev.nvimpager.overrideAttrs (upstream: {
|
||||
# # fix so nvimpager specifies host machine sh as interpreter, not build sh
|
||||
# buildInputs = upstream.buildInputs ++ [
|
||||
# bash
|
||||
# ];
|
||||
# postFixup = (upstream.postFixup or "") + ''
|
||||
# patchShebangs --update --host $out/bin/nvimpager
|
||||
# '';
|
||||
# });
|
||||
|
||||
# 2025/01/25: upstreaming is unblocked
|
||||
papers = prev.papers.override {
|
||||
cargo = crossCargo;
|
||||
|
||||
@@ -8,8 +8,8 @@
|
||||
mkNixpkgs ? import ./mkNixpkgs.nix {},
|
||||
}:
|
||||
mkNixpkgs {
|
||||
rev = "5d9b5431f967007b3952c057fc92af49a4c5f3b2";
|
||||
sha256 = "sha256-nkH2Edu9rClcsQp2PYBe8E6fp8LDPi2uDBQ6wyMdeXI=";
|
||||
version = "0-unstable-2025-03-16";
|
||||
rev = "507af2ca16e0b0119d3c29b55061dac0dfdbf11f";
|
||||
sha256 = "sha256-CQhspnYf6SBbIYyPTqVEon5o3tYLxNkeXCDqFkSwalM=";
|
||||
version = "0-unstable-2025-03-18";
|
||||
branch = "master";
|
||||
}
|
||||
|
||||
@@ -40,13 +40,6 @@ in
|
||||
hash = "sha256-D8Royett8CSZD7xHYEj6qvJCMFaFKz8SNOIBABapgDc=";
|
||||
})
|
||||
|
||||
(fetchpatch' {
|
||||
# 2025-03-16: i'm testing this patch before merge
|
||||
name = "buffybox: 3.2.0-unstable-2025-02-27 -> 3.2.0-unstable-2025-03-12";
|
||||
prUrl = "https://github.com/NixOS/nixpkgs/pull/390324";
|
||||
hash = "sha256-SStQSD4T7JI9GEjnH92P3TXR/OMZNuCs3bT3vFLbQqw=";
|
||||
})
|
||||
|
||||
(fetchpatch' {
|
||||
name = "nvimpager: enable strictDeps & cleanup inputs";
|
||||
prUrl = "https://github.com/NixOS/nixpkgs/pull/390878";
|
||||
@@ -61,6 +54,30 @@ in
|
||||
hash = "sha256-xtA4lzPGZCeZ+rrS8oBSB+rsKCm+JJnWikzAnOI0920=";
|
||||
})
|
||||
|
||||
(fetchpatch' {
|
||||
# 2025-03-13: merged into staging-next
|
||||
# cherry-picked because mpv on pipewire 1.4.0 segfaults when playing .mp3 files,
|
||||
# in libspa-audioconvert.so:run_resample_stage (-> impl_native_process -> __memcpy_generic).
|
||||
# hopefully (speculatively!) this is fixed by bumping pipewire
|
||||
name = "pipewire: 1.4.0 -> 1.4.1";
|
||||
prUrl = "https://github.com/NixOS/nixpkgs/pull/389824";
|
||||
hash = "sha256-Uo3MUP6lJk0i61pJFj2wNKRphpzNZHU96USq1F6Sdlo=";
|
||||
})
|
||||
|
||||
(fetchpatch' {
|
||||
# 2025-03-17: merged into staging-next
|
||||
name = "glycin-loaders: enable strictDeps";
|
||||
prUrl = "https://github.com/NixOS/nixpkgs/pull/390882";
|
||||
hash = "sha256-NKhbKA9JTO1Pzoz1U89OWJO2kVtGwJRr3Lm+CQZVdnE=";
|
||||
})
|
||||
|
||||
(fetchpatch' {
|
||||
# 2025-03-17: merged into staging-next
|
||||
name = "gtk4-layer-shell: fix cross compilation";
|
||||
prUrl = "https://github.com/NixOS/nixpkgs/pull/390999";
|
||||
hash = "sha256-79nUVS2d+Y46lvRVipKChb4jKVBS/MIxlLwRW3nkRNU=";
|
||||
})
|
||||
|
||||
(fetchpatch' {
|
||||
# 2025-03-09: merged into staging
|
||||
name = "libqmi: unbreak cross compilation";
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
mkNixpkgs ? import ./mkNixpkgs.nix {},
|
||||
}:
|
||||
mkNixpkgs {
|
||||
rev = "3e526dc6a531f23fc4021389406758bfc8fb9e3a";
|
||||
sha256 = "sha256-3CHa38sqMhZFrHoivyICKKyC6GKbyFOzu2sc0Dk2xyw=";
|
||||
version = "0-unstable-2025-03-11";
|
||||
rev = "ec3343a6fc1fd80a9284ded41f3c2a4f51dbf53f";
|
||||
sha256 = "sha256-Tk12/aCgwxwYuqKEf7yUW4y3S34NW66Y9GY5nG3bTck=";
|
||||
version = "0-unstable-2025-03-17";
|
||||
branch = "staging";
|
||||
}
|
||||
|
||||
@@ -122,9 +122,9 @@
|
||||
xdg-utils,
|
||||
}:
|
||||
let
|
||||
ringrtcPrebuild = "${signal-desktop}/lib/Signal/resources/app.asar.unpacked/node_modules/@signalapp/ringrtc";
|
||||
ringrtcPrebuild = "${signal-desktop}/lib/signal-desktop/resources/app.asar.unpacked/node_modules/@signalapp/ringrtc";
|
||||
|
||||
betterSqlitePrebuild = "${signal-desktop}/lib/Signal/resources/app.asar.unpacked/node_modules/@signalapp/better-sqlite3";
|
||||
betterSqlitePrebuild = "${signal-desktop}/lib/signal-desktop/resources/app.asar.unpacked/node_modules/@signalapp/better-sqlite3";
|
||||
|
||||
# ringrtcPrebuild = stdenv.mkDerivation {
|
||||
# name = "ringrtc-bin";
|
||||
@@ -387,11 +387,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
# directory structure follows the original `signal-desktop` nix package
|
||||
# directory structure follows the upstream `signal-desktop` nix package
|
||||
mkdir -p $out/lib
|
||||
cp -R release/linux${crossNpmArchExt}-unpacked $out/lib/Signal
|
||||
# cp -R release/linux-unpacked/resources $out/lib/Signal/resources
|
||||
# cp -R release/linux-unpacked/locales $out/lib/Signal/locales
|
||||
cp -R release/linux${crossNpmArchExt}-unpacked $out/lib/signal-desktop
|
||||
# cp -R release/linux-unpacked/resources $out/lib/signal-desktop/resources
|
||||
# cp -R release/linux-unpacked/locales $out/lib/signal-desktop/locales
|
||||
|
||||
mkdir $out/bin
|
||||
|
||||
@@ -402,15 +402,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# fixup the app.asar to:
|
||||
# - use host nodejs
|
||||
# - use host libpulse.so
|
||||
asar extract $out/lib/Signal/resources/app.asar unpacked
|
||||
rm $out/lib/Signal/resources/app.asar
|
||||
asar extract $out/lib/signal-desktop/resources/app.asar unpacked
|
||||
rm $out/lib/signal-desktop/resources/app.asar
|
||||
patchShebangs --host --update unpacked
|
||||
patchelf --add-needed ${libpulseaudio}/lib/libpulse.so unpacked/node_modules/@signalapp/ringrtc/build/linux/libringrtc-*.node
|
||||
cp -R unpacked "$asar"
|
||||
asar pack unpacked $out/lib/Signal/resources/app.asar
|
||||
asar pack unpacked $out/lib/signal-desktop/resources/app.asar
|
||||
|
||||
# patchShebangs --host --update $out/lib/Signal/resources
|
||||
# patchelf --add-needed ${libpulseaudio}/lib/libpulse.so $out/lib/Signal/resources/app.asar.unpacked/node_modules/@signalapp/ringrtc/build/linux/libringrtc-*.node
|
||||
# patchShebangs --host --update $out/lib/signal-desktop/resources
|
||||
# patchelf --add-needed ${libpulseaudio}/lib/libpulse.so $out/lib/signal-desktop/resources/app.asar.unpacked/node_modules/@signalapp/ringrtc/build/linux/libringrtc-*.node
|
||||
|
||||
# # XXX: add --ozone-platform-hint=auto to make it so that NIXOS_OZONE_WL isn't *needed*.
|
||||
# # electron should auto-detect x11 v.s. wayland: launching with `NIXOS_OZONE_WL=1` is an optional way to force it when debugging.
|
||||
@@ -418,13 +418,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# # else `LaunchProcess: failed to execvp: xdg-settings`
|
||||
# makeShellWrapper ${lib.getExe electron'} $out/bin/signal-desktop \
|
||||
# "''${gappsWrapperArgs[@]}" \
|
||||
# --add-flags $out/lib/Signal/resources/app.asar \
|
||||
# --add-flags $out/lib/signal-desktop/resources/app.asar \
|
||||
# --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \
|
||||
# --add-flags --ozone-platform-hint=auto \
|
||||
# --add-flags "\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}" \
|
||||
# --inherit-argv0
|
||||
|
||||
makeShellWrapper $out/lib/Signal/signal-desktop $out/bin/signal-desktop \
|
||||
makeShellWrapper $out/lib/signal-desktop/signal-desktop $out/bin/signal-desktop \
|
||||
"''${gappsWrapperArgs[@]}" \
|
||||
--suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \
|
||||
--add-flags --ozone-platform-hint=auto \
|
||||
|
||||
Reference in New Issue
Block a user