Merge pull request #163872 from jtojnar/treesheets

treesheets: 1.0.1 → unstable-2022-03-12
This commit is contained in:
Jan Tojnar 2022-03-14 17:48:10 +01:00 committed by GitHub
commit 2f544dfb35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 32 deletions

View File

@ -1,41 +1,39 @@
{ lib, stdenv, fetchFromGitHub, wxGTK, makeWrapper }: { lib
, stdenv
, fetchFromGitHub
, wxGTK
, cmake
, ninja
, wrapGAppsHook
, unstableGitUpdater
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "treesheets"; pname = "treesheets";
version = "1.0.1"; version = "unstable-2022-03-12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "aardappel"; owner = "aardappel";
repo = "treesheets"; repo = "treesheets";
rev = "v${version}"; rev = "120c10d4d9ea1ce76db5c1bbd6f5d705b397b57d";
sha256 = "0krsj7i5yr76imf83krz2lmlmpbsvpwqg2d4r0jwxiydjfyj4qr4"; sha256 = "oXgOvvRoZpueEeWnD3jsc6y5RIAzkXzLeEe7BSErBpw=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [
buildInputs = [ wxGTK ]; cmake
ninja
wrapGAppsHook
];
preConfigure = "cd src"; buildInputs = [
wxGTK
];
postInstall = '' NIX_CFLAGS_COMPILE = "-DPACKAGE_VERSION=\"${builtins.replaceStrings [ "unstable-" ] [ "" ] version}\"";
mkdir "$out/share" -p
cp -av ../TS "$out/share/libexec"
mkdir "$out/bin" -p passthru = {
makeWrapper "$out/share/libexec/treesheets" "$out/bin/treesheets" updateScript = unstableGitUpdater { };
};
mkdir "$out/share/doc" -p
for f in readme.html docs examples
do
mv -v "$out/share/libexec/$f" "$out/share/doc"
ln -sv "$out/share/doc/$f" "$out/share/libexec/$f"
done
mkdir "$out/share/applications" -p
mv -v "$out/share/libexec/treesheets.desktop" "$out/share/applications"
substituteInPlace "$out/share/applications/treesheets.desktop" \
--replace "Icon=images/treesheets.svg" "Icon=$out/share/libexec/images/treesheets.svg"
'';
meta = with lib; { meta = with lib; {
description = "Free Form Data Organizer"; description = "Free Form Data Organizer";
@ -49,9 +47,9 @@ stdenv.mkDerivation rec {
planning, requirements gathering, presentation of information, etc. planning, requirements gathering, presentation of information, etc.
''; '';
homepage = "https://strlen.com/treesheets/"; homepage = "https://strlen.com/treesheets/";
maintainers = with maintainers; [ obadz avery ]; maintainers = with maintainers; [ obadz avery ];
platforms = platforms.linux; platforms = platforms.linux;
license = licenses.zlib; license = licenses.zlib;
}; };
} }

View File

@ -29475,7 +29475,9 @@ with pkgs;
tree = callPackage ../tools/system/tree {}; tree = callPackage ../tools/system/tree {};
treesheets = callPackage ../applications/office/treesheets { wxGTK = wxGTK31; }; treesheets = callPackage ../applications/office/treesheets {
wxGTK = wxGTK31-gtk3;
};
tremc = callPackage ../applications/networking/p2p/tremc { }; tremc = callPackage ../applications/networking/p2p/tremc { };