dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

brasero: rename brasero-original to brasero-unwrapped; rhythmbox: use brasero-unwrapped instead of brasero (#345381)

Browse Source
This commit is contained in:
Florian Klink 2024-10-01 19:00:35 +03:00 committed by GitHub
commit b586ee1271
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/audio/rhythmbox/default.nix
View File

@ -21,7 +21,7 @@
, libgpod , libgpod
, libmtp , libmtp
, lirc , lirc
, brasero , brasero-unwrapped # libdvdcss is not needed for rhythmbox
, grilo , grilo
, tdb , tdb
, json-glib , json-glib
@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
libgpod libgpod
libmtp libmtp
lirc lirc
brasero brasero-unwrapped
grilo grilo
python3.pkgs.pygobject3 python3.pkgs.pygobject3

8
pkgs/tools/cd-dvd/brasero/wrapper.nix
View File

@ -1,11 +1,11 @@
{ lib, symlinkJoin, brasero-original, cdrtools, libdvdcss, makeWrapper }: { lib, symlinkJoin, brasero-unwrapped, cdrtools, libdvdcss, makeWrapper }:
let let
binPath = lib.makeBinPath [ cdrtools ]; binPath = lib.makeBinPath [ cdrtools ];
in symlinkJoin { in symlinkJoin {
name = "brasero-${brasero-original.version}"; name = "brasero-${brasero-unwrapped.version}";
paths = [ brasero-original ]; paths = [ brasero-unwrapped ];
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
postBuild = '' postBuild = ''
@ -14,5 +14,5 @@ in symlinkJoin {
--prefix LD_PRELOAD : ${lib.makeLibraryPath [ libdvdcss ]}/libdvdcss.so --prefix LD_PRELOAD : ${lib.makeLibraryPath [ libdvdcss ]}/libdvdcss.so
''; '';
inherit (brasero-original) meta; inherit (brasero-unwrapped) meta;
} }

1
pkgs/top-level/aliases.nix
View File

@ -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 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 bpftool = bpftools; # Added 2021-05-03
bpytop = throw "bpytop has been deprecated by btop"; # Added 2023-02-16 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 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 bs-platform = throw "'bs-platform' was removed as it was broken, development ended and 'melange' has superseded it"; # Added 2024-07-29

2
pkgs/top-level/all-packages.nix
View File

@ -4161,7 +4161,7 @@ with pkgs;
bozohttpd-minimal = bozohttpd.override { minimal = true; }; 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 { }; brasero = callPackage ../tools/cd-dvd/brasero/wrapper.nix { };