maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

release.nix: Drop nix-shell references

Browse source
This commit is contained in:
Eelco Dolstra 2017-01-27 16:13:22 +01:00
parent cb1951e746
commit 583ff4ec46
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
release.nix
View file

@ -20,7 +20,7 @@ let
name = "nix-tarball"; name = "nix-tarball";
version = builtins.readFile ./version; version = builtins.readFile ./version;
versionSuffix = if officialRelease then "" else "pre${toString nix.revCount}_${nix.shortRev}"; versionSuffix = if officialRelease then "" else "pre${toString nix.revCount}_${nix.shortRev}";
src = if lib.inNixShell then null else nix; src = nix;
inherit officialRelease; inherit officialRelease;
buildInputs = buildInputs =
@ -28,7 +28,8 @@ let
pkgconfig sqlite libsodium boehmgc pkgconfig sqlite libsodium boehmgc
docbook5 docbook5_xsl docbook5 docbook5_xsl
autoconf-archive autoconf-archive
] ++ lib.optional (!lib.inNixShell) git; git
];
configureFlags = '' configureFlags = ''
--with-dbi=${perlPackages.DBI}/${perl.libPrefix} --with-dbi=${perlPackages.DBI}/${perl.libPrefix}