[Nix-dev] Re: nix-commits Digest, Vol 26, Issue 74 - Peter Simons - rev 17356 - xlock

[Marc Weber]

Excerpts from nix-commits-request's message of Tue Sep 22 22:16:47 +0200 2009:
> Message: 7
> Date: Tue, 22 Sep 2009 20:16:39 +0000
> From: Peter Simons <simons at cryp.to>
> Subject: [Nix-commits] SVN commit: nix - 17356 - simons - in
>     nixpkgs/trunk/pkgs: misc/screensavers/xlockmore top-level
> To: nix-commits at cs.uu.nl
> Message-ID: <200909222016.n8MKGd0P011532 at proliant.st.ewi.tudelft.nl>
> Content-Type: text/plain; charset=UTF-8
> 
> Author: simons
> Date: 2009-09-22 20:16:38 +0000 (Tue, 22 Sep 2009)
> New Revision: 17356
> 
> You can view the changes in this commit at:
>    https://svn.nixos.org/viewvc/nix?rev=17356&view=rev
> 
> Modified:
>    nixpkgs/trunk/pkgs/misc/screensavers/xlockmore/default.nix
>    nixpkgs/trunk/pkgs/top-level/all-packages.nix
> 
> Log:
> xlock: fixed build and updated to version 5.24
> 
> Changes:
> 
> Modified: nixpkgs/trunk/pkgs/misc/screensavers/xlockmore/default.nix
> ===================================================================
> --- nixpkgs/trunk/pkgs/misc/screensavers/xlockmore/default.nix    2009-09-22
> 19:37:18 UTC (rev 17355)
> +++ nixpkgs/trunk/pkgs/misc/screensavers/xlockmore/default.nix    2009-09-22
> @@ -18,9 +18,26 @@
>  
>    # Don't try to install `xlock' setuid.  Instead, the user should add
>    # it to `security.extraSetuidPrograms'.
> -  configureFlags = 
> -    "--disable-setuid --enable-pam --enable-bad-pam " +
> -    "--enable-appdefaultdir=$out/lib/X11/app-defaults";
> +  configureFlags =
> +    + " --with-crypt"        # TODO: set --enable-appdefaultdir to a suitable value
> +    + " --disable-setuid"
> +    + " --without-editres"
> +    + " --without-xpm"
> +    + " --without-gltt"

Syntax error: + " --wit-crypt" ? Should the first + be removed in line
> +    + " --with-crypt"        # TODO: set --enable-appdefaultdir to a suitable value
?

Marc Weber