diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-26 15:27:25 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-26 15:37:43 +0300 |
| commit | 7b4fc0f5a97aca61a08643938f5104254cc6a39b (patch) | |
| tree | 8d4a018893fc1da344b2640b6ab91b96fa076a4f /pkgs/applications/video/avidemux | |
| parent | 1f89dbd46b9aa6c8ca3877e2fb4463dd61cf217b (diff) | |
| download | nixpkgs-7b4fc0f5a97aca61a08643938f5104254cc6a39b.tar nixpkgs-7b4fc0f5a97aca61a08643938f5104254cc6a39b.tar.gz nixpkgs-7b4fc0f5a97aca61a08643938f5104254cc6a39b.tar.bz2 nixpkgs-7b4fc0f5a97aca61a08643938f5104254cc6a39b.tar.lz nixpkgs-7b4fc0f5a97aca61a08643938f5104254cc6a39b.tar.xz nixpkgs-7b4fc0f5a97aca61a08643938f5104254cc6a39b.tar.zst nixpkgs-7b4fc0f5a97aca61a08643938f5104254cc6a39b.zip | |
avidemux: use symlinkJoin
Diffstat (limited to 'pkgs/applications/video/avidemux')
| -rw-r--r-- | pkgs/applications/video/avidemux/wrapper.nix | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/pkgs/applications/video/avidemux/wrapper.nix b/pkgs/applications/video/avidemux/wrapper.nix index 1d1c66cb9fe..7f05b81baec 100644 --- a/pkgs/applications/video/avidemux/wrapper.nix +++ b/pkgs/applications/video/avidemux/wrapper.nix @@ -1,4 +1,4 @@ -{ buildEnv, avidemux_unwrapped, makeWrapper +{ symlinkJoin, avidemux_unwrapped, makeWrapper # GTK version is broken upstream, see https://bugzilla.redhat.com/show_bug.cgi?id=1244340 , withUi ? "qt4" }: @@ -7,24 +7,14 @@ let ui = builtins.getAttr "avidemux_${withUi}" avidemux_unwrapped; in assert ui.isUi; -buildEnv { - name = "avidemux-${withUi}-" + ui.version; +symlinkJoin { + name = "avidemux-${withUi}-${ui.version}"; paths = [ ui avidemux_unwrapped.avidemux_common avidemux_unwrapped.avidemux_settings ]; - ignoreCollisions = true; - 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 ${ui}/bin/*; do - ln -s $i $out/bin - done - fi for i in $out/bin/*; do wrapProgram $i --set ADM_ROOT_DIR $out done |