Merge pull request #39144 from geistesk/farbfeld-sent-path

farbfeld, sent: wrap PATH for 2ff and sent
This commit is contained in:
Jörg Thalheim
2018-04-22 15:42:20 +01:00
committed by GitHub
2 changed files with 11 additions and 3 deletions
+6 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, farbfeld, libX11, libXft { stdenv, fetchurl, farbfeld, libX11, libXft, makeWrapper
, patches ? [] }: , patches ? [] }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0cxysz5lp25mgww73jl0mgip68x7iyvialyzdbriyaff269xxwvv"; sha256 = "0cxysz5lp25mgww73jl0mgip68x7iyvialyzdbriyaff269xxwvv";
}; };
buildInputs = [ farbfeld libX11 libXft ]; buildInputs = [ libX11 libXft ];
nativeBuildInputs = [ makeWrapper ];
# unpacking doesn't create a directory # unpacking doesn't create a directory
sourceRoot = "."; sourceRoot = ".";
@@ -17,6 +18,9 @@ stdenv.mkDerivation rec {
inherit patches; inherit patches;
installFlags = [ "PREFIX=$(out)" ]; installFlags = [ "PREFIX=$(out)" ];
postInstall = ''
wrapProgram "$out/bin/sent" --prefix PATH : "${farbfeld}/bin"
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A simple plaintext presentation tool"; description = "A simple plaintext presentation tool";
@@ -1,4 +1,4 @@
{ stdenv, fetchgit, libpng, libjpeg }: { stdenv, fetchgit, makeWrapper, file, libpng, libjpeg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "farbfeld-${version}"; name = "farbfeld-${version}";
@@ -11,8 +11,12 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ libpng libjpeg ]; buildInputs = [ libpng libjpeg ];
nativeBuildInputs = [ makeWrapper ];
installFlags = "PREFIX=/ DESTDIR=$(out)"; installFlags = "PREFIX=/ DESTDIR=$(out)";
postInstall = ''
wrapProgram "$out/bin/2ff" --prefix PATH : "${file}/bin"
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Suckless image format with conversion tools"; description = "Suckless image format with conversion tools";