nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

release.nix: Adjust to current Nixpkgs. 

* release.nix: s/buildNativeInputs/nativeBuildInputs/.
This commit is contained in:
Ludovic Courtès 2013-03-18 23:07:42 +01:00
parent a4f08f9258
commit 9c3ac1b641
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
release.nix
View File

@ -42,9 +42,9 @@ let
if builtins.isAttrs drv if builtins.isAttrs drv
then pkgs.lib.overrideDerivation (pythonKludge drv) (args: { then pkgs.lib.overrideDerivation (pythonKludge drv) (args: {
__noChroot = true; __noChroot = true;
buildNativeInputs = map unchroot args.buildNativeInputs; nativeBuildInputs = map unchroot args.nativeBuildInputs;
propagatedBuildNativeInputs = propagatedNativeBuildInputs =
map unchroot args.propagatedBuildNativeInputs; map unchroot args.propagatedNativeBuildInputs;
}) })
else drv; else drv;
@ -82,7 +82,7 @@ let
in in
[ git_light ] ++ [ git_light ] ++
(with pkgs; [ guile sqlite bzip2 libgcrypt ]); (with pkgs; [ guile sqlite bzip2 libgcrypt ]);
buildNativeInputs = with pkgs; [ texinfo gettext cvs pkgconfig ]; nativeBuildInputs = with pkgs; [ texinfo gettext cvs pkgconfig ];
preAutoconf = ''git config submodule.nix.url "${<nix>}"''; preAutoconf = ''git config submodule.nix.url "${<nix>}"'';
configureFlags = configureFlags =
[ "--with-libgcrypt-prefix=${pkgs.libgcrypt}" [ "--with-libgcrypt-prefix=${pkgs.libgcrypt}"
@ -98,7 +98,7 @@ let
pkgs.releaseTools.nixBuild { pkgs.releaseTools.nixBuild {
name = "guix"; name = "guix";
buildInputs = with pkgs; [ guile sqlite bzip2 libgcrypt ]; buildInputs = with pkgs; [ guile sqlite bzip2 libgcrypt ];
buildNativeInputs = [ pkgs.pkgconfig ]; nativeBuildInputs = [ pkgs.pkgconfig ];
src = jobs.tarball; src = jobs.tarball;
configureFlags = configureFlags =
[ "--with-libgcrypt-prefix=${pkgs.libgcrypt}" [ "--with-libgcrypt-prefix=${pkgs.libgcrypt}"