From 63d91b75a1c613a330f0754edf8d81844a92d201 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 5 Apr 2014 14:43:00 -0400 Subject: [PATCH] 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 commit 718466074fa03de4dc1ab0d333fb43d8bbed2c8f, reversing changes made to ea9c8d6a131502009ec583f1c7f785b511c36b8c. --- pkgs/applications/misc/k3b/default.nix | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/misc/k3b/default.nix b/pkgs/applications/misc/k3b/default.nix index 9f9e29f537e..06565065ce5 100644 --- a/pkgs/applications/misc/k3b/default.nix +++ b/pkgs/applications/misc/k3b/default.nix @@ -1,12 +1,8 @@ { stdenv, fetchurl, cmake, qt4, perl, shared_mime_info, libvorbis, taglib , flac, libsamplerate, libdvdread, lame, libsndfile, libmad, gettext , kdelibs, kdemultimedia, automoc4, phonon, libkcddb ? null -, makeWrapper, cdrkit, cdrdao, dvdplusrwtools }: -let - runtimeDeps = [ cdrkit cdrdao dvdplusrwtools ]; -in stdenv.mkDerivation rec { name = "k3b-2.0.2"; @@ -20,22 +16,10 @@ stdenv.mkDerivation rec { flac libsamplerate libdvdread lame libsndfile libmad gettext stdenv.gcc.libc kdelibs kdemultimedia automoc4 phonon - libkcddb makeWrapper - ] - # Runtime dependencies are *not* propagated so they are easy to override. - ++ runtimeDeps; + libkcddb + ]; 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; { description = "CD/DVD Burning Application for KDE";