mail-notification: init at 5.4 #20855
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@proteansec, thanks for your PR! By analyzing the history of the files in this pull request, we identified @zimbatm, @zraexy and @edolstra to be potential reviewers. |
zimbatm
reviewed
Dec 2, 2016
|
|
||
| # copy schemas | ||
| mkdir -p $out/etc/gconf/schemas/ | ||
| #GCONF_CONFIG_SOURCE="xml:merged:${gnome2.GConf}/etc/gconf/gconf.xml.defaults" ${gnome2.GConf}/bin/gconftool-2 --makefile-install-rule data/mail-notification.schemas.in.in |
There was a problem hiding this comment.
yeah, it's a debug leftover, which was now removed
joachifm
reviewed
Dec 2, 2016
| buildInputs = [ pkgconfig glib dbus_glib gmime libnotify libgnome_keyring openssl cyrus_sasl gnonlin sylpheed gob2 gettext intltool gnome2.GConf gnome2.libgnomeui dbus_glib gmime libnotify gnome2.gnome_keyring gnome2.scrollkeeper libxml2 gnome2.gnome_icon_theme hicolor_icon_theme tango-icon-theme ]; | ||
|
|
||
| prePatch = '' | ||
| sed -i -e '/jb_rule_set_install_message/d' -e '/jb_rule_add_install_command/d' jbsrc/jb.c || die |
There was a problem hiding this comment.
Where does die() come from? I'd expect set -e in the generic setup script would be sufficient, is it not?
zimbatm
reviewed
Dec 2, 2016
| meta = with stdenv.lib; { | ||
| description = "Tray status icon, which notifies us when new email arrives"; | ||
| homepage = "http://www.nongnu.org/mailnotify/"; | ||
| license = "GPL-3"; |
There was a problem hiding this comment.
that should be lib.licenses.gpl3
|
The patches are too large, please fetch from an external source if possible. |
Mic92
reviewed
Dec 3, 2016
| @@ -15,17 +15,16 @@ stdenv.mkDerivation rec { | |||
| buildInputs = [ pkgconfig glib dbus_glib gmime libnotify libgnome_keyring openssl cyrus_sasl gnonlin sylpheed gob2 gettext intltool gnome2.GConf gnome2.libgnomeui dbus_glib gmime libnotify gnome2.gnome_keyring gnome2.scrollkeeper libxml2 gnome2.gnome_icon_theme hicolor_icon_theme tango-icon-theme ]; | |||
|
|
|||
| prePatch = '' | |||
| sed -i -e '/jb_rule_set_install_message/d' -e '/jb_rule_add_install_command/d' jbsrc/jb.c || die | |||
| set -e | |||
There was a problem hiding this comment.
set -e is already enabled by default
proteansec
force-pushed
the
pkgs/mail-notification
branch
from
58cbf0f
to
082fab1
Compare
|
I simplified the build: diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
index 05c2384afe..36608f4294 100644
--- a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
@@ -17,57 +17,29 @@ stdenv.mkDerivation rec {
prePatch = ''
sed -i -e '/jb_rule_set_install_message/d' -e '/jb_rule_add_install_command/d' jbsrc/jb.c
- # Ensure we never append -Werror
- sed -i -e 's/ -Werror//' jb jbsrc/jb.c
+ # currently disable the check for missing sheme until a better solution
+ # is found; needed, because otherwise the application doesn't even start
+ # and fails saying it unable to find gconf scheme values.
+ sed -i -e 's/(schema_missing)/(!schema_missing)/g' src/mn-conf.c
'';
patches = [
- ./patches/mail-notification-5.4-remove-ubuntu-special-case.patch
./patches/mail-notification-dont-link-against-bsd-compat.patch
];
patchFlags = "-p0";
+ NIX_CFLAGS_COMPILE = "-Wno-error";
- configurePhase = ''
- ./jb configure
- runHook postConfigure
- '';
+ preConfigure = "./jb configure prefix=$out";
postConfigure = ''
- sed -i -e "/^prefix/c prefix|string|1|$out" \
- -e 's/^pkgdatadir.*/pkgdatadir|string|0|$datadir/g' \
- build/config
-
- # currently disable the check for missing sheme until a better solution
- # is found; needed, because otherwise the application doesn't even start
- # and fails saying it unable to find gconf scheme values.
- sed -i -e 's/(schema_missing)/(!schema_missing)/g' src/mn-conf.c
+ substituteInPlace build/config \
+ --replace "omf-dir|string|1|${gnome2.scrollkeeper}/share/omf" "omf-dir|string|1|$out/share/omf" \
+ --replace "scrollkeeper-dir|string|1|${gnome2.scrollkeeper}/var/lib/scrollkeeper" "omf-dir|string|1|$out/var/lib/scrollkeeper" \
'';
-
- buildPhase = ''
- ./jb build
- '';
-
- # the "./jb install" tries to install directly to nix store, which is not
- # writable, so we have to copy the files ourselves
- installPhase = ''
- # create directories
- mkdir -p $out/{bin,lib,libexec,share,etc,var}
-
- # copy executable
- cp ./build/src/mail-notification $out/bin/
-
- # copy icons
- cp -r art/* $out/share/
-
- # copy schemas
- mkdir -p $out/etc/gconf/schemas/
- cp data/mail-notification.schemas.in.in $out/etc/gconf/schemas/
-
- # copy properties dialogs
- cp ui/* $out/share/
- '';
+ buildPhase = "./jb build";
+ installPhase = "./jb install";
enableParallelBuilding = true;
diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-5.4-remove-ubuntu-special-case.patch b/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-5.4-remove-ubuntu-special-case.patch
deleted file mode 100644
index 4516f32c6f..0000000000
--- a/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-5.4-remove-ubuntu-special-case.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- jbsrc/lib/src/core/jb-feature.c.~1~ 2008-04-27 16:47:27.000000000 +0200
-+++ jbsrc/lib/src/core/jb-feature.c 2008-07-22 11:40:50.856886210 +0200
-@@ -164,8 +164,6 @@
- static void
- gconf_configure (void)
- {
-- JBVariable *variable;
--
- jb_require_program("gconftool-2");
-
- if (! strcmp(jb_variable_get_string("gconf-config-source"), "autodetect"))
-@@ -178,21 +176,6 @@
- jb_variable_set_string("gconf-config-source", config_source);
- g_free(config_source);
- }
--
-- /* fix the default schemas dir on Ubuntu */
-- variable = jb_variable_get_variable_or_error("gconf-schemas-dir");
-- if (! variable->user_set)
-- {
-- static const char *ubuntu_dir = "$datadir/gconf/schemas";
-- char *expanded;
--
-- expanded = jb_variable_expand(ubuntu_dir, NULL);
--
-- if (g_file_test(expanded, G_FILE_TEST_IS_DIR))
-- jb_variable_set_string("gconf-schemas-dir", ubuntu_dir);
--
-- g_free(expanded);
-- }
- }
-
- static void |
proteansec
force-pushed
the
pkgs/mail-notification
branch
from
082fab1
to
f3eda7a
Compare
proteansec
force-pushed
the
pkgs/mail-notification
branch
from
f3eda7a
to
6295d38
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Addition of mail-notification packages.
Things done
(nix.useSandbox on NixOS,
or option
build-use-sandboxinnix.confon non-NixOS)
nix-shell -p nox --run "nox-review wip"./result/bin/)