Unverified Commit b586ee12 authored by Florian Klink's avatar Florian Klink Committed by GitHub
Browse files

brasero: rename brasero-original to brasero-unwrapped; rhythmbox: use...

 brasero: rename brasero-original to brasero-unwrapped; rhythmbox: use brasero-unwrapped instead of brasero (#345381)
parents 83484715 67a452c2
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -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
+4 −4
Original line number Diff line number Diff line
{ 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;
}
+1 −0
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -4161,7 +4161,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 { };