Merge pull request #161140 from Lunarequest/pridecat

This commit is contained in:
legendofmiracles 2022-03-08 18:56:07 -06:00 committed by GitHub
commit 3670683a07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 46 additions and 1 deletions

View File

@ -0,0 +1,23 @@
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation {
pname = "pridecat";
version = "unstable-2020-06-19";
src = fetchFromGitHub {
owner = "lunasorcery";
repo = "pridecat";
rev = "92396b11459e7a4b5e8ff511e99d18d7a1589c96";
sha256 = "sha256-PyGLbbsh9lFXhzB1Xn8VQ9zilivycGFEIc7i8KXOxj8=";
};
# fixes the install path in the Makefile
patches = [ ./fix_install.patch ];
meta = with lib; {
description = "Like cat, but more colorful";
homepage = "https://github.com/lunasorcery/pridecat";
license = licenses.cc-by-nc-sa-40;
maintainers = with maintainers; [ lunarequest ];
};
}

View File

@ -0,0 +1,20 @@
diff --git a/Makefile b/Makefile
index 815c27e..1556807 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
CXX ?= clang
+out ?= /usr/local
all: pridecat
@@ -6,7 +7,8 @@ pridecat: main.cpp
$(CXX) main.cpp -o pridecat -std=c++11 -lstdc++ -Wall -Wextra -O3
install: pridecat
- cp pridecat /usr/local/bin/pridecat
+ mkdir -p ${out}/bin
+ cp pridecat ${out}/bin/pridecat
uninstall:
rm -f /usr/local/bin/pridecat

View File

@ -368,9 +368,11 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
pridecat = callPackage ../tools/misc/pridecat { };
proto-contrib = callPackage ../development/tools/proto-contrib { };
protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {};
protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc { };
protoc-gen-go = callPackage ../development/tools/protoc-gen-go { };