summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlexey Shmalko <rasen.dubi@gmail.com>2018-08-10 20:37:48 +0300
committerxeji <36407913+xeji@users.noreply.github.com>2018-08-10 19:37:48 +0200
commit6b1a04d788183f41dce46d80f4db639b3fed69b7 (patch)
tree7ae4fd1c8613a7dad78557c97b0097eb6afff8e3
parent12eb1e96ce594de4ca0ed339b16e7f1de59fe8f4 (diff)
downloadnixpkgs-6b1a04d788183f41dce46d80f4db639b3fed69b7.tar
nixpkgs-6b1a04d788183f41dce46d80f4db639b3fed69b7.tar.gz
nixpkgs-6b1a04d788183f41dce46d80f4db639b3fed69b7.tar.bz2
nixpkgs-6b1a04d788183f41dce46d80f4db639b3fed69b7.tar.lz
nixpkgs-6b1a04d788183f41dce46d80f4db639b3fed69b7.tar.xz
nixpkgs-6b1a04d788183f41dce46d80f4db639b3fed69b7.tar.zst
nixpkgs-6b1a04d788183f41dce46d80f4db639b3fed69b7.zip
alarm-clock-applet: fix build (#44872)
The build has been failing because sourceforge-served release include
-Werror=format=2 flag, which enabled -Werror=format-y2k, which in turn
stopped the build because of a debug log message formatting.

Building release from GitHub works fine.
-rw-r--r--pkgs/tools/misc/alarm-clock-applet/default.nix28
1 files changed, 21 insertions, 7 deletions
diff --git a/pkgs/tools/misc/alarm-clock-applet/default.nix b/pkgs/tools/misc/alarm-clock-applet/default.nix
index b089240bcc6..8ee363ed91d 100644
--- a/pkgs/tools/misc/alarm-clock-applet/default.nix
+++ b/pkgs/tools/misc/alarm-clock-applet/default.nix
@@ -1,4 +1,9 @@
-{ stdenv, fetchurl, makeWrapper, pkgconfig
+{ stdenv, fetchFromGitHub
+, pkgconfig
+, autoconf
+, automake111x
+, libtool
+
 , glib
 , gtk2
 , gst_all_1
@@ -15,16 +20,27 @@ stdenv.mkDerivation rec {
   version = "0.3.4";
   name = "alarm-clock-applet-${version}";
 
-  src = fetchurl {
-    url = "http://launchpad.net/alarm-clock/trunk/${version}/+download/${name}.tar.gz";
-    sha256 = "1mrrw5cgv0izdmhdg83vprvbj6062yzk77b2nr1nx6hhmk00946r";
+  src = fetchFromGitHub {
+    owner = "joh";
+    repo = "alarm-clock";
+    rev = version;
+    sha256 = "18blvgy8hmw3jidz7xrv9yiiilnzcj65m6wxhw58nrnbcqbpydwn";
   };
 
   nativeBuildInputs = [
-    makeWrapper
     pkgconfig
+    intltool
+    automake111x
+    autoconf
+    libtool
+
+    gnome2.gnome-common
+
+    wrapGAppsHook
   ];
 
+  preConfigure = "./autogen.sh";
+
   buildInputs = [
     glib
     gtk2
@@ -34,8 +50,6 @@ stdenv.mkDerivation rec {
     libnotify
     libxml2
     libunique
-    intltool
-    wrapGAppsHook
   ] ++ gst_plugins;
 
   propagatedUserEnvPkgs = [ gnome2.GConf.out ];