From 1e3289efb4621c8bc68c4ed2f88405f83a9c89ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 19 Jan 2014 22:59:51 +0100 Subject: [PATCH] cgit: fix snapshot feature by using full paths to gzip/bzip2/xz --- .../version-management/git-and-tools/cgit/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index 60c2c43887e6..ce4d9f98596f 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt , docbook_xml_xslt, pkgconfig, luajit +, gzip, bzip2, xz }: stdenv.mkDerivation rec { @@ -23,6 +24,13 @@ stdenv.mkDerivation rec { openssl zlib asciidoc libxml2 libxslt docbook_xml_xslt pkgconfig luajit ]; + postPatch = '' + sed -e 's|"gzip"|"${gzip}/bin/gzip"|' \ + -e 's|"bzip2"|"${bzip2}/bin/bzip2"|' \ + -e 's|"xz"|"${xz}/bin/xz"|' \ + -i ui-snapshot.c + ''; + # Give cgit a git source tree and pass configuration parameters (as make # variables). preBuild = ''