diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-26 16:47:43 +0400 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-26 16:47:43 +0400 |
| commit | f6eb6862221bff46a143fb10b1c16a5ce1f32027 (patch) | |
| tree | 22b68eb6bb5227a362b0987a3e722315d0ba15eb /pkgs/tools/cd-dvd | |
| parent | 07cad5411ef18fa2de2e500d1a78e12a2b3fda6b (diff) | |
| parent | 8415fa35c79214fc2093882ed688f98f9abf7048 (diff) | |
| download | nixlib-f6eb6862221bff46a143fb10b1c16a5ce1f32027.tar nixlib-f6eb6862221bff46a143fb10b1c16a5ce1f32027.tar.gz nixlib-f6eb6862221bff46a143fb10b1c16a5ce1f32027.tar.bz2 nixlib-f6eb6862221bff46a143fb10b1c16a5ce1f32027.tar.lz nixlib-f6eb6862221bff46a143fb10b1c16a5ce1f32027.tar.xz nixlib-f6eb6862221bff46a143fb10b1c16a5ce1f32027.tar.zst nixlib-f6eb6862221bff46a143fb10b1c16a5ce1f32027.zip | |
Merge pull request #15002 from abbradar/symlink-join-wrappers
Use symlinkJoin for wrappers
Diffstat (limited to 'pkgs/tools/cd-dvd')
| -rw-r--r-- | pkgs/tools/cd-dvd/brasero/wrapper.nix | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/pkgs/tools/cd-dvd/brasero/wrapper.nix b/pkgs/tools/cd-dvd/brasero/wrapper.nix index 021e0da0e724..839cc1d604e6 100644 --- a/pkgs/tools/cd-dvd/brasero/wrapper.nix +++ b/pkgs/tools/cd-dvd/brasero/wrapper.nix @@ -1,22 +1,14 @@ -{ lib, buildEnv, brasero-original, cdrtools, makeWrapper }: +{ lib, symlinkJoin, brasero-original, cdrtools, makeWrapper }: let binPath = lib.makeBinPath [ cdrtools ]; -in buildEnv { +in symlinkJoin { 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} ''; |