public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

farbfeld, sent: wrap PATH for 2ff and sent

Browse Source
This commit is contained in:
geistesk 2018-04-19 11:51:06 +02:00
parent 12ce0db1bf
commit fa3f620256
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/misc/sent/default.nix
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";

6
pkgs/development/libraries/farbfeld/default.nix
View File

@ -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";