diff options
| author | Gleb Peregud <gleber.p@gmail.com> | 2017-10-11 21:52:07 +0200 |
|---|---|---|
| committer | Gleb Peregud <gleber.p@gmail.com> | 2017-10-13 22:52:52 +0200 |
| commit | 52bedcb14b303a3f5550950cdf8f7d8281b9ea10 (patch) | |
| tree | 0fbfaa318386239a317732aaab2b6edcb990729f /pkgs/applications/misc | |
| parent | 93babf0c3b1c8103f40e424a34c3da686b1b091d (diff) | |
| download | nixpkgs-52bedcb14b303a3f5550950cdf8f7d8281b9ea10.tar nixpkgs-52bedcb14b303a3f5550950cdf8f7d8281b9ea10.tar.gz nixpkgs-52bedcb14b303a3f5550950cdf8f7d8281b9ea10.tar.bz2 nixpkgs-52bedcb14b303a3f5550950cdf8f7d8281b9ea10.tar.lz nixpkgs-52bedcb14b303a3f5550950cdf8f7d8281b9ea10.tar.xz nixpkgs-52bedcb14b303a3f5550950cdf8f7d8281b9ea10.tar.zst nixpkgs-52bedcb14b303a3f5550950cdf8f7d8281b9ea10.zip | |
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
Diffstat (limited to 'pkgs/applications/misc')
| -rw-r--r-- | pkgs/applications/misc/pgadmin/default.nix | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix index 15313befb62..889f516f00b 100644 --- a/pkgs/applications/misc/pgadmin/default.nix +++ b/pkgs/applications/misc/pgadmin/default.nix @@ -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 { name = "pgadmin3-${version}"; - version = "1.22.1"; + version = "1.22.2"; src = fetchurl { - url = "http://ftp.postgresql.org/pub/pgadmin3/release/v${version}/src/pgadmin3-${version}.tar.gz"; - sha256 = "0gkqpj8cg6jd6yhssrij1cbh960rg9fkjbdzcpryi6axwv0ag7ki"; + url = "http://ftp.postgresql.org/pub/pgadmin/pgadmin3/v${version}/src/pgadmin3-${version}.tar.gz"; + sha256 = "1b24b356h8z188nci30xrb57l7kxjqjnh6dq9ws638phsgiv0s4v"; }; enableParallelBuilding = true; 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 = '' substituteInPlace pgadmin/ver_svn.sh --replace "bin/bash" "$shell" ''; configureFlags = [ + "--with-pgsql=${postgresql}" "--with-libxml2=${libxml2.dev}" "--with-libxslt=${libxslt.dev}" ]; |