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/applications | |
parent | 7cf8daa2bbf7e9ac1b57305a22547271dca28a6e (diff) | |
parent | ef9175c5fb5ae0dc17bdfdffef8859d725f318c1 (diff) | |
download | nixpkgs-31d76ae1b1f8c3ef71e84dd002f0c9396edfa6ca.tar nixpkgs-31d76ae1b1f8c3ef71e84dd002f0c9396edfa6ca.tar.gz nixpkgs-31d76ae1b1f8c3ef71e84dd002f0c9396edfa6ca.tar.bz2 nixpkgs-31d76ae1b1f8c3ef71e84dd002f0c9396edfa6ca.tar.lz nixpkgs-31d76ae1b1f8c3ef71e84dd002f0c9396edfa6ca.tar.xz nixpkgs-31d76ae1b1f8c3ef71e84dd002f0c9396edfa6ca.tar.zst nixpkgs-31d76ae1b1f8c3ef71e84dd002f0c9396edfa6ca.zip |
Merge pull request #14871 from abbradar/choice-cdrtools-cdrkit
CD/DVD writing improvements
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/misc/cdrtools/default.nix | 9 | ||||
-rw-r--r-- | pkgs/applications/misc/k3b/default.nix | 7 | ||||
-rw-r--r-- | pkgs/applications/misc/k3b/wrapper.nix | 23 |
3 files changed, 32 insertions, 7 deletions
diff --git a/pkgs/applications/misc/cdrtools/default.nix b/pkgs/applications/misc/cdrtools/default.nix index 2168a21f7da..55bcfd99e17 100644 --- a/pkgs/applications/misc/cdrtools/default.nix +++ b/pkgs/applications/misc/cdrtools/default.nix @@ -26,10 +26,11 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://sourceforge.net/projects/cdrtools/; description = "Highly portable CD/DVD/BluRay command line recording software"; - # Licensing issues: This package contains code licensed under CDDL, GPL2 - # and LGPL2. There is debate regarding the legality of this licensing. - # Marked as unfree to avoid any possible legal issues. - license = licenses.unfree; + license = with licenses; [ gpl2 lgpl2 cddl ]; platforms = platforms.linux; + # Licensing issues: This package contains code licensed under CDDL, GPL2 + # and LGPL2. There is a debate regarding the legality of distributing this + # package in binary form. + hydraPlatforms = []; }; } diff --git a/pkgs/applications/misc/k3b/default.nix b/pkgs/applications/misc/k3b/default.nix index 922dec11180..8c69e36a4e4 100644 --- a/pkgs/applications/misc/k3b/default.nix +++ b/pkgs/applications/misc/k3b/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, makeWrapper, automoc4, cmake, perl, pkgconfig , shared_mime_info, libvorbis, taglib, flac, libsamplerate , libdvdread, lame, libsndfile, libmad, gettext , transcode, cdrdao -, cdrtools, dvdplusrwtools, vcdimager, cdparanoia, kdelibs, libdvdcss, ffmpeg +, dvdplusrwtools, vcdimager, cdparanoia, kdelibs, libdvdcss, ffmpeg , kdemultimedia, phonon, libkcddb ? null }: @@ -9,10 +9,11 @@ let # at runtime, k3b needs the executables cdrdao, cdrecord, dvd+rw-format, # eMovix, growisofs, mkisofs, normalize, readcd, transcode, vcdxbuild, # vcdxminfo, and vcdxrip - binPath = lib.makeBinPath [ cdrdao dvdplusrwtools transcode vcdimager cdrtools ]; + binPath = lib.makeBinPath [ cdrdao dvdplusrwtools transcode vcdimager ]; in stdenv.mkDerivation rec { - name = "k3b-2.0.3a"; + name = "k3b-${version}"; + version = "2.0.3a"; src = fetchurl { url = "http://download.kde.org/stable/k3b/${name}.tar.xz"; diff --git a/pkgs/applications/misc/k3b/wrapper.nix b/pkgs/applications/misc/k3b/wrapper.nix new file mode 100644 index 00000000000..d5c98a2affa --- /dev/null +++ b/pkgs/applications/misc/k3b/wrapper.nix @@ -0,0 +1,23 @@ +{ lib, buildEnv, k3b-original, cdrtools, makeWrapper }: + +let + binPath = lib.makeBinPath [ cdrtools ]; +in buildEnv { + name = "k3b-${k3b-original.version}"; + + paths = [ k3b-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 ${k3b-original}/bin/*; do + ln -s $i $out/bin + done + fi + wrapProgram $out/bin/k3b \ + --prefix PATH ':' ${binPath} + ''; +} |