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

snapper: various tweaks and fixes

Browse Source 
Fix numerous configuration files referring to ‘/usr’ and ‘/lib’.

Some paths were still ending up in ‘/nix/store/.../nix/store/...’,
despite some well-intended hacks meant to avoid that. Replace them
with other hacks. It's all very fragile and ugly, so snapper should
feel right at home.

Oh, and `snapper create-config ~` still won't actually *do*
anything, because D-Bus (#12452). Use `--no-dbus` and add files
to ‘/etc’ as long as it complains.

Only fair that I help maintain this mess.
This commit is contained in:
Tobias Geerinckx-Rice 2016-01-20 08:00:06 +01:00
parent 72cd96a0e1
commit f1f2b87fdd
1 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
pkgs/tools/misc/snapper/default.nix
View File

@ -1,16 +1,16 @@
{ stdenv, fetchFromGitHub { stdenv, fetchFromGitHub
, autoreconfHook, pkgconfig, docbook_xsl, libxslt, docbook_xml_dtd_45 , autoreconfHook, pkgconfig, docbook_xsl, libxslt, docbook_xml_dtd_45
, acl, attr, boost, btrfs-progs, dbus_libs, diffutils, e2fsprogs, libxml2 , acl, attr, boost, btrfs-progs, dbus_libs, diffutils, e2fsprogs, libxml2
, lvm2, pam, utillinux }: , lvm2, pam, python, utillinux }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "snapper-${ver}"; name = "snapper-${version}";
ver = "0.2.8"; version = "0.2.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "openSUSE"; owner = "openSUSE";
repo = "snapper"; repo = "snapper";
rev = "v${ver}"; rev = "v${version}";
sha256 = "1rj8vy6hq140pbnc7mjjb34mfqdgdah1dmlv2073izdgakh7p38j"; sha256 = "1rj8vy6hq140pbnc7mjjb34mfqdgdah1dmlv2073izdgakh7p38j";
}; };
@ -20,33 +20,48 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
acl attr boost btrfs-progs dbus_libs diffutils e2fsprogs libxml2 acl attr boost btrfs-progs dbus_libs diffutils e2fsprogs libxml2
lvm2 pam utillinux lvm2 pam python utillinux
]; ];
patchPhase = '' postPatch = ''
# work around missing btrfs/version.h; otherwise, use "-DHAVE_BTRFS_VERSION_H" # Hard-coded root paths, hard-coded root paths everywhere...
substituteInPlace snapper/Btrfs.cc --replace "define BTRFS_LIB_VERSION (100)" "define BTRFS_LIB_VERSION (200)"; for file in {client,data,pam,scripts}/Makefile.am; do
substituteInPlace $file \
--replace '$(DESTDIR)/usr' "$out" \
--replace "DESTDIR" "out" \
--replace "/usr" "$out"
done
substituteInPlace pam/Makefile.am \
--replace '/`basename $(libdir)`' "$out/lib"
''; '';
configurePhase = '' configureFlags = [
./configure --disable-silent-rules --disable-ext4 --disable-btrfs-quota --prefix=$out "--disable-ext4" # requires patched kernel & e2fsprogs
''; ];
makeFlags = "DESTDIR=$(out)"; enableParallelBuilding = true;
NIX_CFLAGS_COMPILE = [ "-I${libxml2}/include/libxml2" ]; NIX_CFLAGS_COMPILE = [
"-I${libxml2}/include/libxml2"
];
# Probably a hack, but using DESTDIR and PREFIX makes everything work!
postInstall = '' postInstall = ''
cp -r $out/$out/* $out rm -r $out/etc/cron.*
rm -r $out/nix patchShebangs $out/lib/zypp/plugins/commit/*
''; for file in \
$out/lib/pam_snapper/* \
$out/lib/systemd/system/* \
$out/share/dbus-1/system-services/* \
; do
substituteInPlace $file --replace "/usr" "$out"
done
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Tool for Linux filesystem snapshot management"; description = "Tool for Linux filesystem snapshot management";
homepage = http://snapper.io; homepage = http://snapper.io;
license = licenses.gpl2; license = licenses.gpl2;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = [ maintainers.tstrobel ]; maintainers = with maintainers; [ nckx tstrobel ];
}; };
} }