Revert "Merge branch 'k3b' of git://github.com/ttuegel/nixpkgs"
It turns out this doesn't work due to setuid issues. I had been under the impression that it was partially broken, but it is in fact totally broken. This reverts commit718466074f, reversing changes made toea9c8d6a13.
This commit is contained in:
@@ -1,12 +1,8 @@
|
|||||||
{ stdenv, fetchurl, cmake, qt4, perl, shared_mime_info, libvorbis, taglib
|
{ stdenv, fetchurl, cmake, qt4, perl, shared_mime_info, libvorbis, taglib
|
||||||
, flac, libsamplerate, libdvdread, lame, libsndfile, libmad, gettext
|
, flac, libsamplerate, libdvdread, lame, libsndfile, libmad, gettext
|
||||||
, kdelibs, kdemultimedia, automoc4, phonon, libkcddb ? null
|
, kdelibs, kdemultimedia, automoc4, phonon, libkcddb ? null
|
||||||
, makeWrapper, cdrkit, cdrdao, dvdplusrwtools
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
|
||||||
runtimeDeps = [ cdrkit cdrdao dvdplusrwtools ];
|
|
||||||
in
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "k3b-2.0.2";
|
name = "k3b-2.0.2";
|
||||||
|
|
||||||
@@ -20,23 +16,11 @@ stdenv.mkDerivation rec {
|
|||||||
flac libsamplerate libdvdread lame libsndfile
|
flac libsamplerate libdvdread lame libsndfile
|
||||||
libmad gettext stdenv.gcc.libc
|
libmad gettext stdenv.gcc.libc
|
||||||
kdelibs kdemultimedia automoc4 phonon
|
kdelibs kdemultimedia automoc4 phonon
|
||||||
libkcddb makeWrapper
|
libkcddb
|
||||||
]
|
];
|
||||||
# Runtime dependencies are *not* propagated so they are easy to override.
|
|
||||||
++ runtimeDeps;
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
postInstall =
|
|
||||||
# Wrap k3b with PATH to required tools, so they can be found without being
|
|
||||||
# installed in a profile. The PATH is suffixed so that profile-installed
|
|
||||||
# tools take preference.
|
|
||||||
let extraPath = stdenv.lib.makeSearchPath "bin" runtimeDeps;
|
|
||||||
in ''
|
|
||||||
wrapProgram "$out/bin/k3b" --suffix PATH : ${extraPath}
|
|
||||||
wrapProgram "$out/bin/k3bsetup" --suffix PATH : ${extraPath}
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
description = "CD/DVD Burning Application for KDE";
|
description = "CD/DVD Burning Application for KDE";
|
||||||
license = licenses.gpl2Plus;
|
license = licenses.gpl2Plus;
|
||||||
|
|||||||
Reference in New Issue
Block a user