diff options
| author | Pascal Wittmann <mail@pascal-wittmann.de> | 2015-06-29 17:03:33 +0200 |
|---|---|---|
| committer | Pascal Wittmann <mail@pascal-wittmann.de> | 2015-06-29 17:04:35 +0200 |
| commit | 5ade71b1d748283bd1fd1c8266e5fc077cce9ddb (patch) | |
| tree | 00409bfe66cf9f2ea4d5af933a200c37851052bd /pkgs/applications/graphics/pencil | |
| parent | 851ef7e2de1ea6e1432fae7353162434257bb2d7 (diff) | |
pencil: wrap bin/pencil correctly, fixes #8551
Diffstat (limited to 'pkgs/applications/graphics/pencil')
| -rw-r--r-- | pkgs/applications/graphics/pencil/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix index e6e72cfd6e6a0..19c6334d1d607 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; { |