Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

libproxy: update to build with gcc47, add glib

+8 -4
+8 -4
pkgs/development/libraries/libproxy/default.nix
··· 1 - {stdenv, fetchurl, cmake, zlib}: 2 3 stdenv.mkDerivation rec { 4 - name = "libproxy-0.4.7"; 5 src = fetchurl { 6 url = "http://libproxy.googlecode.com/files/${name}.tar.gz"; 7 - sha256 = "15rp97g3s2xkc842p5qfm8kx3p4awvrwrpl6w71a76qk224abq4g"; 8 }; 9 - buildInputs = [cmake zlib]; 10 }
··· 1 + { stdenv, fetchurl, pkgconfig, cmake, zlib, glib }: 2 3 stdenv.mkDerivation rec { 4 + name = "libproxy-0.4.11"; 5 src = fetchurl { 6 url = "http://libproxy.googlecode.com/files/${name}.tar.gz"; 7 + sha256 = "0jw6454gxjykmbnbh544axi8hzz9gmm4jz1y5gw1hdqnakg36gyw"; 8 }; 9 + 10 + nativeBuildInputs = [ pkgconfig cmake ]; 11 + propagatedBuildInputs = [ zlib ] 12 + # now some optional deps, but many more are possible 13 + ++ [ glib ]; 14 }