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

Merge pull request #76460 from markuskowa/upd-snapper 

snapper: 0.8.6 -> 0.8.7
This commit is contained in:
markuskowa 2019-12-25 13:04:30 +01:00 committed by GitHub
parent dcd5be4af6 fcf2a113e1
commit 1ba5dce4d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,17 +1,17 @@
{ 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, diffutils, e2fsprogs, libxml2 , acl, attr, boost, btrfs-progs, dbus, diffutils, e2fsprogs, libxml2
, lvm2, pam, python, utillinux, fetchpatch }: , lvm2, pam, python, utillinux, fetchpatch, json_c }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "snapper"; pname = "snapper";
version = "0.8.6"; version = "0.8.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "openSUSE"; owner = "openSUSE";
repo = "snapper"; repo = "snapper";
rev = "v${version}"; rev = "v${version}";
sha256 = "1czx8brfhbfi614mqw46d38xwq6w7d5aca3pibwx8zz47rn99w6d"; sha256 = "0605j4f3plb6q8lwf82y2jhply6dwj49jgxk8j16wsbf5k7lqzfq";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
acl attr boost btrfs-progs dbus diffutils e2fsprogs libxml2 acl attr boost btrfs-progs dbus diffutils e2fsprogs libxml2
lvm2 pam python utillinux lvm2 pam python utillinux json_c
]; ];
patches = [ patches = [
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
postPatch = '' postPatch = ''
# Hard-coded root paths, hard-coded root paths everywhere... # Hard-coded root paths, hard-coded root paths everywhere...
for file in {client,data,pam,scripts}/Makefile.am; do for file in {client,data,pam,scripts,zypp-plugin}/Makefile.am; do
substituteInPlace $file \ substituteInPlace $file \
--replace '$(DESTDIR)/usr' "$out" \ --replace '$(DESTDIR)/usr' "$out" \
--replace "DESTDIR" "out" \ --replace "DESTDIR" "out" \