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

Merge pull request #12452 from Profpatsch/snapper 

snapper: 0.2.4 -> 0.2.8
This commit is contained in:
Tobias Geerinckx-Rice 2016-01-18 19:13:59 +01:00
parent 148396c022 9a1f430e53
commit 6c2b00bcb2
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,12 +1,14 @@
{ stdenv, fetchgit, autoconf, automake, boost, pkgconfig, libtool, acl, libxml2, btrfs-progs, dbus_libs, docbook_xsl, libxslt, docbook_xml_dtd_45, diffutils, pam, utillinux, attr, gettext }: { stdenv, fetchFromGitHub, autoconf, automake, boost, pkgconfig, libtool, acl, libxml2, btrfs-progs, dbus_libs, docbook_xsl, libxslt, docbook_xml_dtd_45, diffutils, pam, utillinux, attr, gettext }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "snapper-0.2.4"; name = "snapper-${ver}";
ver = "0.2.8";
src = fetchgit { src = fetchFromGitHub {
url = "https://github.com/openSUSE/snapper"; owner = "openSUSE";
rev = "24e18153f7a32d0185dcfb20f8b8a4709ba8fe4a"; repo = "snapper";
sha256 = "ec4b829430bd7181995e66a26ac86e8ac71c27e77faf8eb06db71d645c6f859b"; rev = "v${ver}";
sha256 = "1rj8vy6hq140pbnc7mjjb34mfqdgdah1dmlv2073izdgakh7p38j";
}; };
buildInputs = [ autoconf automake boost pkgconfig libtool acl libxml2 btrfs-progs dbus_libs docbook_xsl libxslt docbook_xml_dtd_45 diffutils pam utillinux attr gettext ]; buildInputs = [ autoconf automake boost pkgconfig libtool acl libxml2 btrfs-progs dbus_libs docbook_xsl libxslt docbook_xml_dtd_45 diffutils pam utillinux attr gettext ];
@ -18,8 +20,6 @@ stdenv.mkDerivation rec {
substituteInPlace snapper/Makefile.am --replace \ substituteInPlace snapper/Makefile.am --replace \
"libsnapper_la_LIBADD = -lboost_thread-mt -lboost_system-mt -lxml2 -lacl -lz -lm" \ "libsnapper_la_LIBADD = -lboost_thread-mt -lboost_system-mt -lxml2 -lacl -lz -lm" \
"libsnapper_la_LIBADD = -lboost_thread -lboost_system -lxml2 -lacl -lz -lm"; "libsnapper_la_LIBADD = -lboost_thread -lboost_system -lxml2 -lacl -lz -lm";
# general cleanup
sed -i 's/^INCLUDES/AM_CPPFLAGS/' $(grep -rl ^INCLUDES .|grep "\.am$")
''; '';
configurePhase = '' configurePhase = ''