From 8be1f43c23049f61e747cfcc7d4402e5977a34be Mon Sep 17 00:00:00 2001 From: Colin Date: Fri, 18 Aug 2023 20:07:26 +0000 Subject: [PATCH] g4music: m4a support: acquire from upstream PR --- nixpatches/list.nix | 6 ++++++ overlays/preferences.nix | 5 ----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/nixpatches/list.nix b/nixpatches/list.nix index fc5767fe..9cb40717 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -25,6 +25,12 @@ in [ hash = "sha256-CjVAFRcnTjA9DpOdwFwifgriQ9QFFGzchMB0tIVlAQM="; }) + (fetchpatch' { + title = "g4music: add gst-plugins-bad for m4a support"; + prUrl = "https://github.com/NixOS/nixpkgs/pull/249992"; + hash = "sha256-bKlx0vN6Xx0jouPG81YkAf22eIjyReaG/YGnPrmO9xk="; + }) + # (fetchpatch' { # # TODO: check back in on this around 2023-10-01 # title = "libkiwix: 12.0.0 -> 12.1.0"; diff --git a/overlays/preferences.nix b/overlays/preferences.nix index 8b191d47..02754781 100644 --- a/overlays/preferences.nix +++ b/overlays/preferences.nix @@ -2,11 +2,6 @@ # prefer to encode these in `sane.programs` # resort to this method for e.g. system dependencies, or things which are referenced from too many places. (self: super: with self; { - g4music = super.g4music.overrideAttrs (upstream: { - buildInputs = upstream.buildInputs ++ [ - gst_all_1.gst-plugins-bad # for e.g. m4a support - ]; - }); pipewire = super.pipewire.override { # avoid a dep on python3.10-PyQt5, which has mixed qt5 versions. # this means we lose firewire support (oh well..?)