From 5ade71b1d748283bd1fd1c8266e5fc077cce9ddb Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 29 Jun 2015 17:03:33 +0200
Subject: [PATCH] pencil: wrap bin/pencil correctly, fixes #8551

---
 pkgs/applications/graphics/pencil/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix
index e6e72cfd6e6a..19c6334d1d60 100644
--- a/pkgs/applications/graphics/pencil/default.nix
+++ b/pkgs/applications/graphics/pencil/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xulrunner }:
+{ stdenv, fetchurl, makeWrapper, xulrunner }:
 
 stdenv.mkDerivation rec {
   version = "2.0.11";
@@ -12,15 +12,19 @@ stdenv.mkDerivation rec {
 
   buildPhase = "";
 
+  buildInputs = [ makeWrapper ];
+
   installPhase = ''
     mkdir -p "$out"
     cp -r usr/* "$out"
-    sed -e "s|/usr/bin/xulrunner|${xulrunner}/bin/xulrunner|" \
-        -e "s|/usr/share/evolus-pencil|$out/share/evolus-pencil|" \
+    sed -e "s|/usr/share/evolus-pencil|$out/share/evolus-pencil|" \
         -i "$out/bin/pencil"
     sed -e "s|/usr/bin/pencil|$out/bin/pencil|" \
         -e "s|Icon=.*|Icon=$out/share/evolus-pencil/skin/classic/icon.svg|" \
         -i "$out/share/applications/pencil.desktop"
+
+    wrapProgram $out/bin/pencil \
+      --prefix PATH ":" ${xulrunner}/bin
   '';
 
   meta = with stdenv.lib; {