diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-03-16 18:48:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-16 18:48:53 +0100 |
| commit | 9ae51deffaff8310786e5f68323641572294e4fc (patch) | |
| tree | 3ee06bff355e7d230af01485316cdaa43f3e74f8 /pkgs | |
| parent | 92bb91f72f649d49bacb55e3b735455d5a740771 (diff) | |
| parent | dc32b87082d5295a2cf5393235f76f703d6a48ad (diff) | |
| download | nixlib-9ae51deffaff8310786e5f68323641572294e4fc.tar nixlib-9ae51deffaff8310786e5f68323641572294e4fc.tar.gz nixlib-9ae51deffaff8310786e5f68323641572294e4fc.tar.bz2 nixlib-9ae51deffaff8310786e5f68323641572294e4fc.tar.lz nixlib-9ae51deffaff8310786e5f68323641572294e4fc.tar.xz nixlib-9ae51deffaff8310786e5f68323641572294e4fc.tar.zst nixlib-9ae51deffaff8310786e5f68323641572294e4fc.zip | |
Merge pull request #23886 from dtzWill/fix/timewarrior-install-docs-themes
timewarrior: patch to install all themes; use default install target.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/misc/timewarrior/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/misc/timewarrior/install-all-themes.patch | 27 |
2 files changed, 28 insertions, 5 deletions
diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix index 091d51d33059..d417140b29bf 100644 --- a/pkgs/applications/misc/timewarrior/default.nix +++ b/pkgs/applications/misc/timewarrior/default.nix @@ -13,11 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - installPhase = '' - mkdir -p $out/{bin,share/man/man1} - cp -rv doc/man/*.1 $out/share/man/man1 - cp src/timew $out/bin/ - ''; + patches = [ ./install-all-themes.patch ]; meta = with stdenv.lib; { description = "A command-line time tracker"; diff --git a/pkgs/applications/misc/timewarrior/install-all-themes.patch b/pkgs/applications/misc/timewarrior/install-all-themes.patch new file mode 100644 index 000000000000..c6e8d3b0dbf7 --- /dev/null +++ b/pkgs/applications/misc/timewarrior/install-all-themes.patch @@ -0,0 +1,27 @@ +From e4a14c61bff3a55de42718dc11b282c4d5342995 Mon Sep 17 00:00:00 2001 +From: Will Dietz <w@wdtz.org> +Date: Tue, 14 Mar 2017 07:51:02 -0500 +Subject: [PATCH] doc/themes: install all themes, not just 'dark.theme'. + +--- + doc/themes/CMakeLists.txt | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/doc/themes/CMakeLists.txt b/doc/themes/CMakeLists.txt +index a954576..3a3b453 100644 +--- a/doc/themes/CMakeLists.txt ++++ b/doc/themes/CMakeLists.txt +@@ -2,5 +2,8 @@ cmake_minimum_required (VERSION 2.8) + + message ("-- Configuring theme documentation") + +-install (FILES README DESTINATION ${TIMEW_DOCDIR}/doc/themes) +-install (FILES dark.theme DESTINATION ${TIMEW_DOCDIR}/doc/themes) ++install (FILES README DESTINATION ${TIMEW_DOCDIR}/doc/themes) ++install (FILES dark.theme DESTINATION ${TIMEW_DOCDIR}/doc/themes) ++install (FILES dark_blue.theme DESTINATION ${TIMEW_DOCDIR}/doc/themes) ++install (FILES dark_green.theme DESTINATION ${TIMEW_DOCDIR}/doc/themes) ++install (FILES dark_red.theme DESTINATION ${TIMEW_DOCDIR}/doc/themes) +-- +2.12.0 + |