Switch to using Guix to get the custom version of ikiwikiHEADmaster

2 files changed, 21 insertions, 9 deletions

diff --git a/Makefile b/Makefile
index ad0fd19..1623bfd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,6 @@
 
-ikiwiki:
-	git clone -b osm-icon-fixes git://git.cbaines.net/ikiwiki
-
-ikiwiki-dest: ikiwiki
-	cd ikiwiki && perl Makefile.PL PREFIX=../ikiwiki-dest && make && make install
-
-all: ikiwiki-dest
-	export PERL5LIB=`pwd`/ikiwiki && PATH=ikiwiki-dest/bin:$(PATH); find . -maxdepth 1 -name "*\.setup" -exec ikiwiki --setup {} \;
+all:
+	guix environment --ad-hoc -l guix.scm -- find . -maxdepth 1 -name "*\.setup" -exec ikiwiki --setup {} \;
 
 clean:
-	rm -rf ikiwiki-dest
 	rm -rf dest
diff --git a/guix.scm b/guix.scm
new file mode 100644
index 0000000..34b9179
--- /dev/null
+++ b/guix.scm
@@ -0,0 +1,19 @@
+(use-modules (guix packages)
+             (guix git-download)
+             (gnu packages web))
+
+(define custom-ikiwiki
+  (let ((commit "43b44dbbda102ff0e7f00693c3a80c7af10f2a7e"))
+    (package
+      (inherit ikiwiki)
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "http://git.cbaines.net/ikiwiki")
+                      (commit commit)))
+                (sha256
+                 (base32
+                  "1mqlh779kcql8nxjdfws9p2z7xyygn2xp4h6gc4vzc6m0lhb84m6"))
+                (file-name (string-append "ikiwiki-" (string-take commit 7))))))))
+
+custom-ikiwiki