diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-04-28 00:13:53 +0300 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-04-28 00:13:53 +0300 |
commit | 4ff8f377afcfcb206c585f165dc1332c9fb1eba1 (patch) | |
tree | 2df363c4be265610f3982377b3a1dc61870a544a /pkgs/tools/cd-dvd/brasero/wrapper.nix | |
parent | 7ac1ef05fa162d8e3c35925034df72288df77c8b (diff) | |
parent | 49d1acb50f6465aceb5502de62e0c5d3a3d1d1a4 (diff) | |
download | nixlib-4ff8f377afcfcb206c585f165dc1332c9fb1eba1.tar nixlib-4ff8f377afcfcb206c585f165dc1332c9fb1eba1.tar.gz nixlib-4ff8f377afcfcb206c585f165dc1332c9fb1eba1.tar.bz2 nixlib-4ff8f377afcfcb206c585f165dc1332c9fb1eba1.tar.lz nixlib-4ff8f377afcfcb206c585f165dc1332c9fb1eba1.tar.xz nixlib-4ff8f377afcfcb206c585f165dc1332c9fb1eba1.tar.zst nixlib-4ff8f377afcfcb206c585f165dc1332c9fb1eba1.zip |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/tools/cd-dvd/brasero/wrapper.nix')
-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} ''; |