summary refs log tree commit diff
path: root/pkgs/development/libraries/libproxy
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2013-04-03 15:13:11 +0200
committerVladimír Čunát <vcunat@gmail.com>2013-04-03 15:13:11 +0200
commit4cdcd4e74fd61fad30e7e32cef2df00309e82f1c (patch)
treec93ec336992424fd9d869234e86f4b4af0a9557a /pkgs/development/libraries/libproxy
parent2660b9115fc254b32a8eaa927f87ff8195d1dec7 (diff)
downloadnixpkgs-4cdcd4e74fd61fad30e7e32cef2df00309e82f1c.tar
nixpkgs-4cdcd4e74fd61fad30e7e32cef2df00309e82f1c.tar.gz
nixpkgs-4cdcd4e74fd61fad30e7e32cef2df00309e82f1c.tar.bz2
nixpkgs-4cdcd4e74fd61fad30e7e32cef2df00309e82f1c.tar.lz
nixpkgs-4cdcd4e74fd61fad30e7e32cef2df00309e82f1c.tar.xz
nixpkgs-4cdcd4e74fd61fad30e7e32cef2df00309e82f1c.tar.zst
nixpkgs-4cdcd4e74fd61fad30e7e32cef2df00309e82f1c.zip
libproxy: update to build with gcc47, add glib
Diffstat (limited to 'pkgs/development/libraries/libproxy')
-rw-r--r--pkgs/development/libraries/libproxy/default.nix12
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix
index 8461bfef439..7085236feb5 100644
--- a/pkgs/development/libraries/libproxy/default.nix
+++ b/pkgs/development/libraries/libproxy/default.nix
@@ -1,10 +1,14 @@
-{stdenv, fetchurl, cmake, zlib}:
+{ stdenv, fetchurl, pkgconfig, cmake, zlib, glib }:
 
 stdenv.mkDerivation rec {
-  name = "libproxy-0.4.7";
+  name = "libproxy-0.4.11";
   src = fetchurl {
     url = "http://libproxy.googlecode.com/files/${name}.tar.gz";
-    sha256 = "15rp97g3s2xkc842p5qfm8kx3p4awvrwrpl6w71a76qk224abq4g";
+    sha256 = "0jw6454gxjykmbnbh544axi8hzz9gmm4jz1y5gw1hdqnakg36gyw";
   };
-  buildInputs = [cmake zlib];
+
+  nativeBuildInputs = [ pkgconfig cmake ];
+  propagatedBuildInputs = [ zlib ]
+    # now some optional deps, but many more are possible
+    ++ [ glib ];
 }