From b09f8110dbcb8bc8a1fcdb3e9a5dddb0956aba96 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 18 Nov 2013 15:23:30 -0500 Subject: [PATCH] nspr: Bump to 4.10.2 Signed-off-by: Shea Levy --- pkgs/development/interpreters/python/wrapper.nix | 5 +++++ pkgs/development/libraries/nspr/default.nix | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index 34af23740d5..a408397ef89 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -22,6 +22,11 @@ rm -f "$out/bin/$prg" makeWrapper "${python}/bin/$prg" "$out/bin/$prg" --set PYTHONHOME "$out" done + + if [ -f ${python}/nix-support/setup-hook ]; then + mkdir -p $out/nix-support/ + ln -sv ${python}/nix-support/setup-hook $out/nix-support + fi '' + postBuild; }) // { inherit python; diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 80368031349..2b6f952696c 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl }: -let version = "4.10.1"; in +let version = "4.10.2"; in stdenv.mkDerivation { name = "nspr-${version}"; src = fetchurl { url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; - sha1 = "bd1cdf5e7e107846ffe431c5c62b81a560e8c3f7"; + sha1 = "650e4aa35d58624bc1083ed585c81c4af09cf23c"; }; preConfigure = "cd nspr";