diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-25 13:42:03 +0400 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-25 13:42:03 +0400 |
| commit | 31d76ae1b1f8c3ef71e84dd002f0c9396edfa6ca (patch) | |
| tree | b8f224947d534c02f69229bee8af3e63f840f7b5 /pkgs/tools | |
| parent | 7cf8daa2bbf7e9ac1b57305a22547271dca28a6e (diff) | |
| parent | ef9175c5fb5ae0dc17bdfdffef8859d725f318c1 (diff) | |
| download | nixlib-31d76ae1b1f8c3ef71e84dd002f0c9396edfa6ca.tar nixlib-31d76ae1b1f8c3ef71e84dd002f0c9396edfa6ca.tar.gz nixlib-31d76ae1b1f8c3ef71e84dd002f0c9396edfa6ca.tar.bz2 nixlib-31d76ae1b1f8c3ef71e84dd002f0c9396edfa6ca.tar.lz nixlib-31d76ae1b1f8c3ef71e84dd002f0c9396edfa6ca.tar.xz nixlib-31d76ae1b1f8c3ef71e84dd002f0c9396edfa6ca.tar.zst nixlib-31d76ae1b1f8c3ef71e84dd002f0c9396edfa6ca.zip | |
Merge pull request #14871 from abbradar/choice-cdrtools-cdrkit
CD/DVD writing improvements
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/cd-dvd/brasero/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/tools/cd-dvd/brasero/wrapper.nix | 23 |
2 files changed, 27 insertions, 4 deletions
diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix index ff910ad2e494..e903601c81dd 100644 --- a/pkgs/tools/cd-dvd/brasero/default.nix +++ b/pkgs/tools/cd-dvd/brasero/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchurl, pkgconfig, gtk3, itstool, gst_all_1, libxml2, libnotify -, libcanberra_gtk3, intltool, makeWrapper, dvdauthor, cdrdao -, dvdplusrwtools, cdrtools, vcdimager, wrapGAppsHook }: +, libcanberra_gtk3, intltool, makeWrapper, dvdauthor, libburn, libisofs +, vcdimager, wrapGAppsHook }: # libdvdcss is "too old" (in fast "too new"), see https://bugs.launchpad.net/ubuntu/+source/brasero/+bug/611590 let major = "3.12"; minor = "1"; - binpath = lib.makeBinPath [ dvdauthor cdrdao dvdplusrwtools vcdimager cdrtools ]; + binpath = lib.makeBinPath [ dvdauthor vcdimager ]; in stdenv.mkDerivation rec { version = "${major}.${minor}"; @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook ]; - buildInputs = [ gtk3 libxml2 libnotify libcanberra_gtk3 + buildInputs = [ gtk3 libxml2 libnotify libcanberra_gtk3 libburn libisofs gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly gst_all_1.gst-libav ]; diff --git a/pkgs/tools/cd-dvd/brasero/wrapper.nix b/pkgs/tools/cd-dvd/brasero/wrapper.nix new file mode 100644 index 000000000000..021e0da0e724 --- /dev/null +++ b/pkgs/tools/cd-dvd/brasero/wrapper.nix @@ -0,0 +1,23 @@ +{ lib, buildEnv, brasero-original, cdrtools, makeWrapper }: + +let + binPath = lib.makeBinPath [ cdrtools ]; +in buildEnv { + name = "brasero-${brasero-original.version}"; + + paths = [ brasero-original ]; + buildInputs = [ makeWrapper ]; + + postBuild = '' + # TODO: This could be avoided if buildEnv could be forced to create all directories + if [ -L $out/bin ]; then + rm $out/bin + mkdir $out/bin + for i in ${brasero-original}/bin/*; do + ln -s $i $out/bin + done + fi + wrapProgram $out/bin/brasero \ + --prefix PATH ':' ${binPath} + ''; +} |