MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 00:08:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

dbus: minor update, style refactoring, parallel build

Browse source
This commit is contained in:
Vladimír Čunát 2013-09-06 15:51:38 +02:00
parent e12c5deabe
commit 0cf8a74e82
1 changed files with 32 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
pkgs/development/libraries/dbus/default.nix
View file

@ -3,8 +3,8 @@
, libX11, libICE, libSM, useX11 ? stdenv.isLinux }:
let
version = "1.6.12"; # 1.7.* isn't recommended, even for gnome 3.8
sha256 = "14pfh2ksn4srfry752kf1jy3c61hklcs9fx2xglw2ifhsszplypn";
version = "1.6.14"; # 1.7.* isn't recommended, even for gnome 3.8
sha256 = "0v7mcxwfmpjf7vndnvf2kf02al61clrxs36bqii20s0lawfh2xjn";
inherit (stdenv) lib;
@ -25,30 +25,13 @@ let
inherit sha256;
};
configureFlags = [
"--localstatedir=/var"
"--sysconfdir=/etc"
"--with-session-socket-dir=/tmp"
"--with-systemdsystemunitdir=$(out)/lib/systemd"
];
preConfigure = ''
patchShebangs .
substituteInPlace tools/Makefile.am --replace 'install-localstatelibDATA:' 'disabled:'
autoreconf -fi
'';
installFlags = "sysconfdir=$(out)/etc";
doCheck = true;
patches = [ ./ignore-missing-includedirs.patch ]
++ lib.optional (stdenv.isSunOS || stdenv.isLinux/*avoid rebuilds*/) ./implement-getgrouplist.patch
++ [ ./ucred-dirty-hack.patch ./no-create-dirs.patch ];
nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ expat ];
buildInputs = [ autoconf automake libtool ]; # ToDo: optional selinux?
patches = [
./ignore-missing-includedirs.patch
./ucred-dirty-hack.patch
./no-create-dirs.patch
]
++ lib.optional (stdenv.isSunOS || stdenv.isLinux) ./implement-getgrouplist.patch
;
# build only the specified subdirs
postPatch = "sed '/SUBDIRS/s/=.*/=" + subdirs + "/' -i Makefile.am\n"
@ -59,6 +42,29 @@ let
done
'';
nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ expat ];
buildInputs = [ autoconf automake libtool ]; # ToDo: optional selinux?
preConfigure = ''
patchShebangs .
substituteInPlace tools/Makefile.am --replace 'install-localstatelibDATA:' 'disabled:'
autoreconf -fi
'';
configureFlags = [
"--localstatedir=/var"
"--sysconfdir=/etc"
"--with-session-socket-dir=/tmp"
"--with-systemdsystemunitdir=$(out)/lib/systemd"
];
enableParallelBuilding = true;
doCheck = true;
installFlags = "sysconfdir=$(out)/etc";
} merge ]);
libs = dbus_drv "libs" "dbus" ({