the-distro/channel-scripts
1
0
Fork 1
Code Issues 8 Pull requests Packages Projects Releases Wiki Activity

Update build

Browse source
This commit is contained in:
Eelco Dolstra 2017-04-18 15:26:38 +02:00
parent a5368b6239
commit dd0d2d2ca6
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
default.nix
View file

@ -4,8 +4,7 @@ with pkgs;
let let
# FIXME nix = nixUnstable;
nix = builtins.storePath /nix/store/cvrdgdx0gzdi0yf2831f4j98d518m3ln-nix-1.12pre1234_abcdef;
#lib.overrideDerivation nixUnstable (orig: { #lib.overrideDerivation nixUnstable (orig: {
# src = /home/eelco/Dev/nix; # src = /home/eelco/Dev/nix;
#}); #});
@ -16,13 +15,17 @@ stdenv.mkDerivation {
name = "nixos-channel-scripts"; name = "nixos-channel-scripts";
buildInputs = with perlPackages; buildInputs = with perlPackages;
[ nix sqlite makeWrapper perl FileSlurp LWP LWPProtocolHttps ListMoreUtils DBDSQLite NetAmazonS3 boehmgc nlohmann_json ]; [ pkgconfig nix sqlite makeWrapper perl FileSlurp LWP LWPProtocolHttps ListMoreUtils DBDSQLite NetAmazonS3 boehmgc nlohmann_json ];
buildCommand = '' buildCommand = ''
mkdir -p $out/bin mkdir -p $out/bin
g++ -g ${./generate-programs-index.cc} -Wall -std=c++11 -o $out/bin/generate-programs-index \ g++ -g ${./generate-programs-index.cc} -Wall -std=c++14 -o $out/bin/generate-programs-index \
-I ${nix}/include/nix -lnixmain -lnixexpr -lnixformat -lsqlite3 -lgc -I . $(pkg-config --cflags nix-main) \
$(pkg-config --libs nix-main) \
$(pkg-config --libs nix-expr) \
$(pkg-config --libs nix-store) \
-lsqlite3 -lgc
cp ${./mirror-nixos-branch.pl} $out/bin/mirror-nixos-branch cp ${./mirror-nixos-branch.pl} $out/bin/mirror-nixos-branch
wrapProgram $out/bin/mirror-nixos-branch --set PERL5LIB $PERL5LIB --prefix PATH : ${wget}/bin:${git}/bin:${nix}/bin:${gnutar}/bin:${xz}/bin:$out/bin wrapProgram $out/bin/mirror-nixos-branch --set PERL5LIB $PERL5LIB --prefix PATH : ${wget}/bin:${git}/bin:${nix}/bin:${gnutar}/bin:${xz}/bin:$out/bin

2
generate-programs-index.cc
View file

@ -1,3 +1,5 @@
#include <nix/config.h>
#include <chrono> #include <chrono>
#include <regex> #include <regex>