wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-07 01:51:47 +02:00
Code Activity

Factor out commonality between release.nix and shell.nix

Browse source
This commit is contained in:
Eelco Dolstra 2018-03-14 19:11:13 +01:00
parent ca14b14200
commit c04bca3401
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
3 changed files with 43 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

28
release.nix
View file

@ -14,6 +14,8 @@ let
tarball =
with pkgs;
with import ./release-common.nix { inherit pkgs; };
releaseTools.sourceTarball {
name = "nix-tarball";
version = builtins.readFile ./version;
@ -21,13 +23,7 @@ let
src = nix;
inherit officialRelease;
buildInputs =
[ curl bison flex libxml2 libxslt
bzip2 xz brotli
pkgconfig sqlite libsodium boehmgc
docbook5 docbook5_xsl
autoconf-archive
] ++ lib.optional stdenv.isLinux libseccomp;
buildInputs = tarballDeps ++ buildDeps;
configureFlags = "--enable-gc";
@ -67,23 +63,7 @@ let
name = "nix";
src = tarball;
buildInputs =
[ curl
bzip2 xz brotli
openssl pkgconfig sqlite boehmgc
boost
# Tests
git
mercurial
]
++ lib.optional stdenv.isLinux libseccomp
++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
++ lib.optional (stdenv.isLinux || stdenv.isDarwin)
(aws-sdk-cpp.override {
apis = ["s3"];
customMemoryManagement = false;
});
buildInputs = buildDeps;
configureFlags = configureFlags ++
[ "--sysconfdir=/etc" ];