[Nix-dev] Re: [Nix-commits] SVN commit: nix - r28645 - nixpkgs/trunk/pkgs/os-specific/linux/blcr

Marco Maggesi maggesi at math.unifi.it
Thu Aug 18 10:15:55 CEST 2011


Good point.
And thanks for having committed the fix.
Marco

On Aug 17, 2011, at 6:51 PM, Shea Levy wrote:

> kmod-dir should use kernel.modDirVersion. See https://svn.nixos.org/websvn/nix/nixpkgs/trunk/pkgs/os-specific/linux/kernel/generic.nix?op=log&;; for why. 
> -- 
> Sent from my Android phone with K-9 Mail. Please excuse my brevity.
> 
> Marco Maggesi <maggesi at math.unifi.it> wrote:
> Author: maggesi
> Date: Wed Aug 17 16:22:20 2011
> New Revision: 28645
> URL: https://svn.nixos.org/websvn/nix/?rev=28645&sc=1
> 
> Log:
> Symplify expression for BLCR
> 
> Modified:
>    nixpkgs/trunk/pkgs/os-specific/linux/blcr/default.nix
> 
> Modified: nixpkgs/trunk/pkgs/os-specific/linux/blcr/default.nix
> 
> --- nixpkgs/trunk/pkgs/os-specific/linux/blcr/default.nix	Wed Aug 17 15:05:48 2011	(r28644)
> +++ nixpkgs/trunk/pkgs/os-specific/linux/blcr/default.nix	Wed Aug 17 16:22:20 2011	(r28645)
> @@ -1,4 +1,4 @@
> -{ stdenv, fetchurl, kernel, perl, makeWrapper, autoconf, automake, libtool }:
> +{ stdenv, fetchurl, kernel, perl, makeWrapper }:
>  
>  assert stdenv.isLinux;
>  
> @@ -10,13 +10,12 @@
>      sha256 =
> "c8243c9a7a215d4fc4e8f2199045711cf711a6f2e0b39a94413478ffae110eac";
> 
>    };
>  
> -  buildInputs = [ perl makeWrapper autoconf automake libtool ];
> +  buildInputs = [ perl makeWrapper ];
>  
>    preConfigure = ''
> -    ./autogen.sh
>      configureFlagsArray=(
> -      --with-linux=$(ls -d ${kernel}/lib/modules/*/build)
> -      --with-kmod-dir=$out/lib/modules/$(cd ${kernel}/lib/modules; ls -d 2.6.*)
> +      --with-linux=${kernel}/lib/modules/${kernel.version}/build
> +      --with-kmod-dir=$out/lib/modules/${kernel.version}
>        --with-system-map=${kernel}/System.map
>      )
>    '';
> 
> nix-commits mailing list
> nix-commits at cs.uu.nl
> http://mail.cs.uu.nl/mailman/listinfo/nix-commits
> _______________________________________________
> nix-dev mailing list
> nix-dev at cs.uu.nl
> https://mail.cs.uu.nl/mailman/listinfo/nix-dev




More information about the nix-dev mailing list