From d40e636bdc27341ca8dc72b0dd6763126930138c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 26 Apr 2016 15:26:55 +0300
Subject: k3b: use symlinkJoin

---
 pkgs/applications/misc/k3b/wrapper.nix | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'pkgs/applications/misc/k3b')

diff --git a/pkgs/applications/misc/k3b/wrapper.nix b/pkgs/applications/misc/k3b/wrapper.nix
index d5c98a2affa7..486d3fb7ddf7 100644
--- a/pkgs/applications/misc/k3b/wrapper.nix
+++ b/pkgs/applications/misc/k3b/wrapper.nix
@@ -1,22 +1,14 @@
-{ lib, buildEnv, k3b-original, cdrtools, makeWrapper }:
+{ lib, symlinkJoin, k3b-original, cdrtools, makeWrapper }:
 
 let
   binPath = lib.makeBinPath [ cdrtools ];
-in buildEnv {
+in symlinkJoin {
   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}
   '';
-- 
cgit 1.4.1