dia: 0.97.3 -> 0.97.3.20170622

+18 -12
+18 -12
pkgs/applications/graphics/dia/default.nix
··· 1 - {stdenv, fetchurl, gtk2, pkgconfig, perl, perlXMLParser, libxml2, gettext 2 - , python, libxml2Python, docbook5, docbook_xsl, libxslt, intltool, libart_lgpl 3 - , withGNOME ? false, libgnomeui }: 1 + { stdenv, fetchgit, autoconf, automake, libtool, gtk2, pkgconfig, perl, 2 + perlXMLParser, libxml2, gettext, python, libxml2Python, docbook5, docbook_xsl, 3 + libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui, 4 + gtk-mac-integration }: 4 5 5 6 stdenv.mkDerivation rec { 6 - name = "dia-${minVer}.3"; 7 - minVer = "0.97"; 7 + name = "dia-${version}"; 8 + version = "0.97.3.20170622"; 8 9 9 - src = fetchurl { 10 - url = "mirror://gnome/sources/dia/${minVer}/${name}.tar.xz"; 11 - sha256 = "0d3x6w0l6fwd0l8xx06y1h56xf8ss31yzia3a6xr9y28xx44x492"; 10 + src = fetchgit { 11 + url = git://git.gnome.org/dia; 12 + rev = "b86085dfe2b048a2d37d587adf8ceba6fb8bc43c"; 13 + sha256 = "1fyxfrzdcs6blxhkw3bcgkksaf3byrsj4cbyrqgb4869k3ynap96"; 12 14 }; 13 15 14 16 buildInputs = 15 17 [ gtk2 perlXMLParser libxml2 gettext python libxml2Python docbook5 16 - libxslt docbook_xsl libart_lgpl 17 - ] ++ stdenv.lib.optional withGNOME libgnomeui; 18 + libxslt docbook_xsl libart_lgpl ] 19 + ++ stdenv.lib.optional withGNOME libgnomeui 20 + ++ stdenv.lib.optional stdenv.isDarwin gtk-mac-integration; 18 21 19 - nativeBuildInputs = [ pkgconfig intltool perl ]; 22 + nativeBuildInputs = [ autoconf automake libtool pkgconfig intltool perl ]; 20 23 24 + preConfigure = '' 25 + NOCONFIGURE=1 ./autogen.sh # autoreconfHook is not enough 26 + ''; 21 27 configureFlags = stdenv.lib.optionalString withGNOME "--enable-gnome"; 22 28 23 - patches = [ ]; 29 + hardeningDisable = [ "format" ]; 24 30 25 31 # This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command 26 32 # It have no reasons to exist in a redistribuable package