[Nix-dev] patch problem

[Roelof Wobben]

I did change to what you said so it looks like this:

>From 8c95cacffb0195ac47eaacf2595e985ee48251c0 Mon Sep 17 00:00:00 2001
From: Roelof Wobben <rwobben at hotmail.com>
Date: Sat, 30 Nov 2013 18:28:02 +0100
Subject: [PATCH] fix

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git cjs-2.0.0/configure.ac cjs-2.0.0/configure.ac
index 8bdca06..ed55060 100644
--- cjs-2.0.0/configure.ac
+++ cjs-2.0.0/configure.ac
@@ -11,7 +11,7 @@ AC_INIT([cjs], pkg_version, [http://bugzilla.gnome.org/enter_bug.cgi?product=cjs
 AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip])
 AC_CONFIG_SRCDIR([cjs/console.c])
 AC_CONFIG_HEADER([config.h])
-
+AC_CONFIG_MACRO_DIR([m4]
 
 GETTEXT_PACKAGE=cjs
 AC_SUBST([GETTEXT_PACKAGE])
-- 
1.8.4.3

But still this error message:

patching file configure.ac
Hunk #1 FAILED at 11.
1 out of 1 hunk FAILED -- saving rejects to file configure.ac.rej

Roelof



From: danny at decube.net
Subject: Re: [Nix-dev] patch problem
Date: Sat, 30 Nov 2013 19:14:01 +0100
To: rwobben at hotmail.com

Hoi Roelof,
My guess is you didn’t read the error message. :-D
Do you know about the nix-env -K option ( —keep-failed).  It keeps the failed build in a folder in /tmp.There you can see that extracting cjs-2.0.0.tar.gz creates another directory where all the source files are.
But your patch: https://github.com/roelof1967/nixpkgs/blob/master/pkgs/desktops/cinnamon/fix_configure_ac_gobject.patch#L12  says the file is located in a Folder called “a/“ (or “b/“)
So to fix this you can change “a/"  and   “b/"   to   "cjs-2.0.0/"
Good luck x-)

PS: It’s actually very annoying Nix doesnt cd to the extracted source directory in the patchPhase as patch files become tied to a specific package version, but I guess there’s a good reason for this behaviour ...

On 30 nov. 2013, at 17:20, Roelof Wobben <rwobben at hotmail.com> wrote:Hello, 

Here is my repo : https://github.com/roelof1967/nixpkgs

When I try to patch cjs.nix which is in pkgs/desktops/cinnamon  the patch fails 

But when I patch the file on the real file it is not a problem.

Can anyone explain what is the difference here ?
So why do the patch fail on the cjs derivation.

Roelof

_______________________________________________
nix-dev mailing list
nix-dev at lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev
 		 	   		  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.science.uu.nl/pipermail/nix-dev/attachments/20131130/6e6fd933/attachment-0001.html