public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

polkit: update, including non-critical CVE-2013-4288 fix

Browse Source
This commit is contained in:
Vladimír Čunát 2013-09-30 14:48:16 +02:00
parent e1e0a11f86
commit a7d129b05e
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/interpreters/spidermonkey/185-1.0.0.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, autoconf213, nspr, perl, python, readline, zip }:
{ stdenv, fetchurl, pkgconfig, autoconf213, nspr, perl, python, readline, zip }:
stdenv.mkDerivation rec {
version = "185-1.0.0";
@ -9,7 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687";
};
buildInputs = [ autoconf213 nspr perl python readline zip ];
propagatedBuildInputs = [ nspr ];
buildInputs = [ pkgconfig autoconf213 perl python readline zip ];
postUnpack = "sourceRoot=\${sourceRoot}/js/src";

14
pkgs/development/libraries/polkit/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, glib, expat, pam, intltool, gettext
{ stdenv, fetchurl, pkgconfig, glib, expat, pam, intltool, spidermonkey
, gobjectIntrospection
, useSystemd ? true, systemd }:
@ -16,18 +16,22 @@ let
in
stdenv.mkDerivation rec {
name = "polkit-0.105";
name = "polkit-0.112";
src = fetchurl {
url = "http://www.freedesktop.org/software/polkit/releases/${name}.tar.gz";
sha256 = "1pz1hn4z0f1wk4f7w8q1g6ygwan1b6kxmfad3b7gql27pb47rp4g";
sha256 = "1xkary7yirdcjdva950nqyhmsz48qhrdsr78zciahj27p8yg95fn";
};
buildInputs =
[ pkgconfig glib expat pam intltool gobjectIntrospection ]
[ pkgconfig glib expat pam intltool spidermonkey gobjectIntrospection ]
++ stdenv.lib.optional useSystemd systemd;
configureFlags = "--libexecdir=$(out)/libexec/polkit-1";
# TODO: Distro/OS detection is impure
configureFlags = [
"--libexecdir=$(out)/libexec/polkit-1"
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
];
# Ugly hack to overwrite hardcoded directories
# TODO: investigate a proper patch which will be accepted upstream

4
pkgs/top-level/all-packages.nix
View File

@ -5329,7 +5329,9 @@ let
podofo = callPackage ../development/libraries/podofo { };
polkit = callPackage ../development/libraries/polkit { };
polkit = callPackage ../development/libraries/polkit {
spidermonkey = spidermonkey_185;
};
polkit_qt_1 = callPackage ../development/libraries/polkit-qt-1 { };