From faa9afbdfd492ed262e67383fa69d5cddeb0e415 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 2 Nov 2017 10:48:03 +0100 Subject: [PATCH] masterpdfeditor: move assets into $out/opt/masterpdfeditor, symlink from $out/bin --- .../applications/misc/masterpdfeditor/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index 764d400820d6..76d23f1a8f08 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -22,26 +22,25 @@ ]; dontStrip = true; installPhase = '' - mkdir -p $out/bin $out/share/applications $out/share/pixmaps + p=$out/opt/masterpdfeditor + mkdir -p $out/bin $p $out/share/applications $out/share/pixmaps substituteInPlace masterpdfeditor4.desktop \ --replace 'Exec=/opt/master-pdf-editor-4' "Exec=$out/bin" \ --replace 'Path=/opt/master-pdf-editor-4' "Path=$out/bin" \ --replace 'Icon=/opt/master-pdf-editor-4' "Icon=$out/share/pixmaps" - - cp -v masterpdfeditor4 $out/bin/masterpdfeditor4 cp -v masterpdfeditor4.png $out/share/pixmaps/ cp -v masterpdfeditor4.desktop $out/share/applications - cp -v -r stamps $out/bin/stamps - cp -v -r templates $out/bin/templates - cp -v -r lang $out/bin/lang - cp -v -r fonts $out/bin/fonts + cp -v masterpdfeditor4 $p/ + ln -s $p/masterpdfeditor4 $out/bin/masterpdfeditor4 + cp -v -r stamps templates lang fonts $p + install -D license.txt $out/share/$name/LICENSE patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $libPath \ - $out/bin/masterpdfeditor4 + $p/masterpdfeditor4 ''; meta = with stdenv.lib; { description = "Master PDF Editor";