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

Merge pull request #16168 from romildo/fix.gksu

Browse Source 
gksu: use nativeBuildInputs and wrapGAppsHook
This commit is contained in:
zimbatm 2016-06-12 23:55:34 +01:00 committed by GitHub
commit f663822cc8
2 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/applications/misc/gksu/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, makeWrapper, gtk, gnome3, libgksu, { stdenv, fetchurl, pkgconfig, gtk, gnome3, libgksu,
intltool, libstartup_notification, gtk_doc intltool, libstartup_notification, gtk_doc, wrapGAppsHook
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -12,6 +12,18 @@ stdenv.mkDerivation rec {
sha256 = "0npfanlh28daapkg25q4fncxd89rjhvid5fwzjaw324x0g53vpm1"; sha256 = "0npfanlh28daapkg25q4fncxd89rjhvid5fwzjaw324x0g53vpm1";
}; };
nativeBuildInputs = [
pkgconfig intltool gtk_doc wrapGAppsHook
];
buildInputs = [
gtk gnome3.gconf libstartup_notification gnome3.libgnome_keyring
];
propagatedBuildInputs = [
libgksu
];
patches = [ patches = [
# https://savannah.nongnu.org/bugs/index.php?36127 # https://savannah.nongnu.org/bugs/index.php?36127
./gksu-2.0.2-glib-2.31.patch ./gksu-2.0.2-glib-2.31.patch
@ -23,15 +35,6 @@ stdenv.mkDerivation rec {
configureFlags = "--disable-nautilus-extension"; configureFlags = "--disable-nautilus-extension";
buildInputs = [
pkgconfig makeWrapper gtk gnome3.gconf intltool
libstartup_notification gnome3.libgnome_keyring gtk_doc
];
propagatedBuildInputs = [
libgksu
];
meta = { meta = {
description = "A graphical frontend for libgksu"; description = "A graphical frontend for libgksu";
longDescription = '' longDescription = ''

26
pkgs/development/libraries/libgksu/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, makeWrapper, gtk, gnome, gnome3, { stdenv, fetchurl, pkgconfig, wrapGAppsHook, gtk, gnome, gnome3,
libstartup_notification, libgtop, perl, perlXMLParser, libstartup_notification, libgtop, perl, perlXMLParser,
autoreconfHook, intltool, gtk_doc, docbook_xsl, xauth, sudo autoreconfHook, intltool, gtk_doc, docbook_xsl, xauth, sudo
}: }:
@ -13,6 +13,17 @@ stdenv.mkDerivation rec {
sha256 = "1brz9j3nf7l2gd3a5grbp0s3nksmlrp6rxmgp5s6gjvxcb1wzy92"; sha256 = "1brz9j3nf7l2gd3a5grbp0s3nksmlrp6rxmgp5s6gjvxcb1wzy92";
}; };
nativeBuildInputs = [
pkgconfig autoreconfHook intltool gtk_doc docbook_xsl wrapGAppsHook
];
buildInputs = [
gtk gnome.GConf libstartup_notification
gnome3.libgnome_keyring libgtop gnome.libglade perl perlXMLParser
];
enableParallelBuilding = true;
patches = [ patches = [
# Patches from the gentoo ebuild # Patches from the gentoo ebuild
@ -54,19 +65,6 @@ stdenv.mkDerivation rec {
intltoolize --force --copy --automake intltoolize --force --copy --automake
''; '';
buildInputs = [
pkgconfig makeWrapper gtk gnome.GConf libstartup_notification
gnome3.libgnome_keyring libgtop gnome.libglade perl perlXMLParser
autoreconfHook intltool gtk_doc docbook_xsl
];
preFixup = ''
wrapProgram "$out/bin/gksu-properties" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
'';
enableParallelBuilding = true;
meta = { meta = {
description = "A library for integration of su into applications"; description = "A library for integration of su into applications";
longDescription = '' longDescription = ''