pgadmin3: 1.22.1 -> 1.22.2

Also include Debian patch
https://sources.debian.net/data/main/p/pgadmin3/1.22.2-1/debian/patches/843344
which fixes segfault at start
This commit is contained in:
Gleb Peregud 2017-10-11 21:52:07 +02:00
parent 93babf0c3b
commit 52bedcb14b

View File

@ -1,23 +1,32 @@
{ stdenv, fetchurl, postgresql, wxGTK, libxml2, libxslt, openssl, zlib, makeDesktopItem }: { stdenv, fetchurl, fetchpatch, postgresql, wxGTK, libxml2, libxslt, openssl, zlib, makeDesktopItem }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pgadmin3-${version}"; name = "pgadmin3-${version}";
version = "1.22.1"; version = "1.22.2";
src = fetchurl { src = fetchurl {
url = "http://ftp.postgresql.org/pub/pgadmin3/release/v${version}/src/pgadmin3-${version}.tar.gz"; url = "http://ftp.postgresql.org/pub/pgadmin/pgadmin3/v${version}/src/pgadmin3-${version}.tar.gz";
sha256 = "0gkqpj8cg6jd6yhssrij1cbh960rg9fkjbdzcpryi6axwv0ag7ki"; sha256 = "1b24b356h8z188nci30xrb57l7kxjqjnh6dq9ws638phsgiv0s4v";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
buildInputs = [ postgresql wxGTK openssl zlib ]; buildInputs = [ postgresql wxGTK openssl zlib ];
patches = [
(fetchpatch {
sha256 = "09hp7s3zjz80rpx2j3xyznwswwfxzi70z7c05dzrdk74mqjjpkfk";
name = "843344.patch";
url = "https://sources.debian.net/data/main/p/pgadmin3/1.22.2-1/debian/patches/843344";
})
];
preConfigure = '' preConfigure = ''
substituteInPlace pgadmin/ver_svn.sh --replace "bin/bash" "$shell" substituteInPlace pgadmin/ver_svn.sh --replace "bin/bash" "$shell"
''; '';
configureFlags = [ configureFlags = [
"--with-pgsql=${postgresql}"
"--with-libxml2=${libxml2.dev}" "--with-libxml2=${libxml2.dev}"
"--with-libxslt=${libxslt.dev}" "--with-libxslt=${libxslt.dev}"
]; ];