From 504c448b513bdc86a9ea3d99953cd9cb26a48116 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Sun, 29 Sep 2024 16:52:03 -0600 Subject: [PATCH 1/2] brasero: rename brasero-original to brasero-unwrapped --- pkgs/tools/cd-dvd/brasero/wrapper.nix | 8 ++++---- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/cd-dvd/brasero/wrapper.nix b/pkgs/tools/cd-dvd/brasero/wrapper.nix index 5371e8d526b8..dc5c6fc4ad30 100644 --- a/pkgs/tools/cd-dvd/brasero/wrapper.nix +++ b/pkgs/tools/cd-dvd/brasero/wrapper.nix @@ -1,11 +1,11 @@ -{ lib, symlinkJoin, brasero-original, cdrtools, libdvdcss, makeWrapper }: +{ lib, symlinkJoin, brasero-unwrapped, cdrtools, libdvdcss, makeWrapper }: let binPath = lib.makeBinPath [ cdrtools ]; in symlinkJoin { - name = "brasero-${brasero-original.version}"; + name = "brasero-${brasero-unwrapped.version}"; - paths = [ brasero-original ]; + paths = [ brasero-unwrapped ]; nativeBuildInputs = [ makeWrapper ]; postBuild = '' @@ -14,5 +14,5 @@ in symlinkJoin { --prefix LD_PRELOAD : ${lib.makeLibraryPath [ libdvdcss ]}/libdvdcss.so ''; - inherit (brasero-original) meta; + inherit (brasero-unwrapped) meta; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 33c0602e8a5e..226895f9569f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -190,6 +190,7 @@ mapAliases { bpb = throw "bpb has been removed as it is unmaintained and not compatible with recent Rust versions"; # Added 2024-04-30 bpftool = bpftools; # Added 2021-05-03 bpytop = throw "bpytop has been deprecated by btop"; # Added 2023-02-16 + brasero-original = lib.warn "Use 'brasero-unwrapped' instead of 'brasero-original'" brasero-unwrapped; # Added 2024-09-29 bro = throw "'bro' has been renamed to/replaced by 'zeek'"; # Converted to throw 2023-09-10 bs-platform = throw "'bs-platform' was removed as it was broken, development ended and 'melange' has superseded it"; # Added 2024-07-29 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 46d1f2e3a76f..bc4deeb38ed2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4167,7 +4167,7 @@ with pkgs; bozohttpd-minimal = bozohttpd.override { minimal = true; }; - brasero-original = lowPrio (callPackage ../tools/cd-dvd/brasero { }); + brasero-unwrapped = callPackage ../tools/cd-dvd/brasero { }; brasero = callPackage ../tools/cd-dvd/brasero/wrapper.nix { }; From 67a452c21843cf7346d222d2ff74e1eeae3c5463 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Mon, 30 Sep 2024 12:52:04 -0600 Subject: [PATCH 2/2] rhythmbox: use brasero-unwrapped instead of brasero --- pkgs/applications/audio/rhythmbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix index f09a663454b9..eb4d9629fbb8 100644 --- a/pkgs/applications/audio/rhythmbox/default.nix +++ b/pkgs/applications/audio/rhythmbox/default.nix @@ -21,7 +21,7 @@ , libgpod , libmtp , lirc -, brasero +, brasero-unwrapped # libdvdcss is not needed for rhythmbox , grilo , tdb , json-glib @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { libgpod libmtp lirc - brasero + brasero-unwrapped grilo python3.pkgs.pygobject3