Skip to content

Commit 504c448

Browse files
committed
brasero: rename brasero-original to brasero-unwrapped
1 parent af61785 commit 504c448

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
{ lib, symlinkJoin, brasero-original, cdrtools, libdvdcss, makeWrapper }:
1+
{ lib, symlinkJoin, brasero-unwrapped, cdrtools, libdvdcss, makeWrapper }:
22

33
let
44
binPath = lib.makeBinPath [ cdrtools ];
55
in symlinkJoin {
6-
name = "brasero-${brasero-original.version}";
6+
name = "brasero-${brasero-unwrapped.version}";
77

8-
paths = [ brasero-original ];
8+
paths = [ brasero-unwrapped ];
99
nativeBuildInputs = [ makeWrapper ];
1010

1111
postBuild = ''
@@ -14,5 +14,5 @@ in symlinkJoin {
1414
--prefix LD_PRELOAD : ${lib.makeLibraryPath [ libdvdcss ]}/libdvdcss.so
1515
'';
1616

17-
inherit (brasero-original) meta;
17+
inherit (brasero-unwrapped) meta;
1818
}

pkgs/top-level/aliases.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ mapAliases {
190190
bpb = throw "bpb has been removed as it is unmaintained and not compatible with recent Rust versions"; # Added 2024-04-30
191191
bpftool = bpftools; # Added 2021-05-03
192192
bpytop = throw "bpytop has been deprecated by btop"; # Added 2023-02-16
193+
brasero-original = lib.warn "Use 'brasero-unwrapped' instead of 'brasero-original'" brasero-unwrapped; # Added 2024-09-29
193194
bro = throw "'bro' has been renamed to/replaced by 'zeek'"; # Converted to throw 2023-09-10
194195
bs-platform = throw "'bs-platform' was removed as it was broken, development ended and 'melange' has superseded it"; # Added 2024-07-29
195196

pkgs/top-level/all-packages.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4167,7 +4167,7 @@ with pkgs;
41674167

41684168
bozohttpd-minimal = bozohttpd.override { minimal = true; };
41694169

4170-
brasero-original = lowPrio (callPackage ../tools/cd-dvd/brasero { });
4170+
brasero-unwrapped = callPackage ../tools/cd-dvd/brasero { };
41714171

41724172
brasero = callPackage ../tools/cd-dvd/brasero/wrapper.nix { };
41734173

0 commit comments

Comments
 (0)