diff options
| author | worldofpeace <worldofpeace@users.noreply.github.com> | 2019-02-22 13:45:57 -0500 |
|---|---|---|
| committer | worldofpeace <worldofpeace@users.noreply.github.com> | 2019-02-22 19:16:21 -0500 |
| commit | ac2546bffe6c980642c9f6a71df06efa226b8816 (patch) | |
| tree | 55dea6ca55698acc5b832c0113450e206d2e43d3 /pkgs | |
| parent | 276077a42f9686945585dba351ad1f54fd8bc003 (diff) | |
| download | nixlib-ac2546bffe6c980642c9f6a71df06efa226b8816.tar nixlib-ac2546bffe6c980642c9f6a71df06efa226b8816.tar.gz nixlib-ac2546bffe6c980642c9f6a71df06efa226b8816.tar.bz2 nixlib-ac2546bffe6c980642c9f6a71df06efa226b8816.tar.lz nixlib-ac2546bffe6c980642c9f6a71df06efa226b8816.tar.xz nixlib-ac2546bffe6c980642c9f6a71df06efa226b8816.tar.zst nixlib-ac2546bffe6c980642c9f6a71df06efa226b8816.zip | |
notes-up: default without pantheon support
This adds pantheon.notes-up which will only work in pantheon.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/office/notes-up/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/desktops/pantheon/default.nix | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/applications/office/notes-up/default.nix b/pkgs/applications/office/notes-up/default.nix index 79a0c0207029..2dee39a0ad3b 100644 --- a/pkgs/applications/office/notes-up/default.nix +++ b/pkgs/applications/office/notes-up/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, cmake, ninja, gtk3, gtksourceview3, webkitgtk, gtkspell3, glib, libgee, sqlite, discount, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, pantheon, pkgconfig, cmake, ninja, gtk3, gtksourceview3, webkitgtk, gtkspell3, glib, libgee, sqlite, discount, wrapGAppsHook +, withPantheon ? false }: stdenv.mkDerivation rec { pname = "notes-up"; @@ -31,8 +32,12 @@ stdenv.mkDerivation rec { webkitgtk ]; + # Whether to build with contractor support (Pantheon specific) + cmakeFlags = if withPantheon then null else [ "-Dnoele=yes" ]; + meta = with stdenv.lib; { - description = "Markdown notes editor and manager designed for elementary OS"; + description = "Markdown notes editor and manager designed for elementary OS" + + stdenv.lib.optionalString withPantheon " - built with Contractor support"; homepage = https://github.com/Philip-Scott/Notes-up; license = licenses.gpl2; maintainers = with maintainers; [ davidak worldofpeace ]; diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index a7b8a01eeb0b..27e6e02a4a37 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -62,6 +62,8 @@ lib.makeScope pkgs.newScope (self: with self; { elementary-gsettings-schemas = callPackage ./desktop/elementary-gsettings-schemas { }; + notes-up = pkgs.notes-up.override { withPantheon = true; }; + #### APPS elementary-calculator = callPackage ./apps/elementary-calculator { }; |