mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-01 19:33:03 +00:00
Merge pull request #39144 from geistesk/farbfeld-sent-path
farbfeld, sent: wrap PATH for 2ff and sent
This commit is contained in:
commit
69ee53a899
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, farbfeld, libX11, libXft
|
||||
{ stdenv, fetchurl, farbfeld, libX11, libXft, makeWrapper
|
||||
, patches ? [] }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0cxysz5lp25mgww73jl0mgip68x7iyvialyzdbriyaff269xxwvv";
|
||||
};
|
||||
|
||||
buildInputs = [ farbfeld libX11 libXft ];
|
||||
buildInputs = [ libX11 libXft ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
# unpacking doesn't create a directory
|
||||
sourceRoot = ".";
|
||||
@ -17,6 +18,9 @@ stdenv.mkDerivation rec {
|
||||
inherit patches;
|
||||
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/sent" --prefix PATH : "${farbfeld}/bin"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A simple plaintext presentation tool";
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchgit, libpng, libjpeg }:
|
||||
{ stdenv, fetchgit, makeWrapper, file, libpng, libjpeg }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "farbfeld-${version}";
|
||||
@ -11,8 +11,12 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
buildInputs = [ libpng libjpeg ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installFlags = "PREFIX=/ DESTDIR=$(out)";
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/2ff" --prefix PATH : "${file}/bin"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Suckless image format with conversion tools";
|
||||
|
Loading…
Reference in New Issue
Block a user