diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2017-05-25 19:05:46 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2017-05-25 19:07:21 +0300 |
| commit | e7fa6220d622bf352a06a4328da8679fbfffced3 (patch) | |
| tree | 5070e1c3b7f52f473302fded65fbddf642b093d6 /pkgs/development/libraries/polkit | |
| parent | 5479f742e66e90b298353a8df858840d374e1515 (diff) | |
polkit: add patches from Fedora
This fixes few leaks and adds ITS description files which are needed for some
reverse dependencies.
Diffstat (limited to 'pkgs/development/libraries/polkit')
| -rw-r--r-- | pkgs/development/libraries/polkit/default.nix | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index c1f8725f6f7c..804bca5f8a5e 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -1,6 +1,8 @@ -{ stdenv, fetchurl, pkgconfig, glib, expat, pam, intltool, spidermonkey_17 -, gobjectIntrospection, libxslt, docbook_xsl, docbook_xml_dtd_412 -, useSystemd ? stdenv.isLinux, systemd }: +{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, glib, expat, pam +, intltool, spidermonkey_17 , gobjectIntrospection, libxslt, docbook_xsl +, docbook_xml_dtd_412, gtk_doc +, useSystemd ? stdenv.isLinux, systemd +}: let @@ -22,11 +24,28 @@ stdenv.mkDerivation rec { sha256 = "109w86kfqrgz83g9ivggplmgc77rz8kx8646izvm2jb57h4rbh71"; }; + patches = [ + (fetchpatch { + url = "http://pkgs.fedoraproject.org/cgit/rpms/polkit.git/plain/polkit-0.113-agent-leaks.patch?id=fa6fd575804de92886c95d3bc2b7eb2abcd13760"; + sha256 = "1cxnhj0y30g7ldqq1y6zwsbdwcx7h97d3mpd3h5jy7dhg3h9ym91"; + }) + (fetchpatch { + url = "http://pkgs.fedoraproject.org/cgit/rpms/polkit.git/plain/polkit-0.113-polkitpermission-leak.patch?id=fa6fd575804de92886c95d3bc2b7eb2abcd13760"; + sha256 = "1h1rkd4avqyyr8q6836zzr3w10jf521gcqnvhrhzwdpgp1ay4si7"; + }) + (fetchpatch { + url = "http://pkgs.fedoraproject.org/cgit/rpms/polkit.git/plain/polkit-0.113-itstool.patch?id=fa6fd575804de92886c95d3bc2b7eb2abcd13760"; + sha256 = "0bxmjwp8ahy1y5g1l0kxmld0l3mlvb2l0i5n1qabia3d5iyjkyfh"; + }) + ]; + outputs = [ "bin" "dev" "out" ]; # small man pages in $bin + nativeBuildInputs = + [ gtk_doc pkgconfig autoreconfHook ] + ++ [ libxslt docbook_xsl docbook_xml_dtd_412 ]; # man pages buildInputs = - [ pkgconfig glib expat pam intltool spidermonkey_17 gobjectIntrospection ] - ++ [ libxslt docbook_xsl docbook_xml_dtd_412 ] # man pages + [ glib expat pam intltool spidermonkey_17 gobjectIntrospection ] ++ stdenv.lib.optional useSystemd systemd; # Ugly hack to overwrite hardcoded directories |