fix build
This commit is contained in:
parent
1c2ff72eb1
commit
b605d30899
10
default.nix
10
default.nix
|
@ -4,11 +4,9 @@ let
|
|||
callPackage = pkgs.lib.callPackageWith (pkgs // self);
|
||||
x = callPackage ./pkgs/x { };
|
||||
quickserv = callPackage sources.quickserv { };
|
||||
dhall = callPackage sources.easy-dhall-nix { };
|
||||
|
||||
self = {
|
||||
# nix tools
|
||||
dhallToNix = import ./pkgs/dhallToNix.nix;
|
||||
dockerImage = callPackage ./pkgs/dockerImage.nix { };
|
||||
srcNoTarget = import ./pkgs/srcNoTarget.nix;
|
||||
|
||||
|
@ -19,13 +17,6 @@ let
|
|||
MoonPlus = callPackage ./pkgs/moonplus { };
|
||||
minica = callPackage ./pkgs/minica { };
|
||||
|
||||
# dhall
|
||||
dhall = dhall.dhall-simple;
|
||||
dhall-bash = dhall.dhall-bash-simple;
|
||||
dhall-nix = dhall.dhall-nix-simple;
|
||||
dhall-json = dhall.dhall-json-simple;
|
||||
dhall-yaml = dhall.dhall-yaml-simple;
|
||||
|
||||
# lojban
|
||||
johaus = callPackage ./pkgs/johaus { };
|
||||
jvozba = callPackage ./pkgs/jvozba { };
|
||||
|
@ -38,6 +29,7 @@ let
|
|||
|
||||
# x
|
||||
appsluggr = x.appsluggr;
|
||||
dnsd = x.dnsd;
|
||||
license = x.license;
|
||||
mainsanow = x.mainsanow;
|
||||
prefix = x.prefix;
|
||||
|
|
|
@ -20,6 +20,7 @@ let
|
|||
|
||||
subPackages = [
|
||||
"cmd/appsluggr"
|
||||
"cmd/dnsd"
|
||||
"cmd/johaus"
|
||||
"cmd/license"
|
||||
"cmd/mainsanow"
|
||||
|
@ -30,6 +31,7 @@ let
|
|||
outputs = [
|
||||
"out" # keep the default output but don't use it
|
||||
"appsluggr"
|
||||
"dnsd"
|
||||
"johaus"
|
||||
"license"
|
||||
"mainsanow"
|
||||
|
@ -40,6 +42,7 @@ let
|
|||
installPhase = ''
|
||||
dir=$GOPATH/bin
|
||||
install -D $dir/appsluggr $appsluggr/bin/appsluggr
|
||||
install -D $dir/dnsd $dnsd/bin/dnsd
|
||||
install -D $dir/johaus $johaus/bin/johaus
|
||||
install -D $dir/license $license/bin/license
|
||||
install -D $dir/mainsanow $mainsanow/bin/mainsanow
|
||||
|
@ -52,6 +55,7 @@ let
|
|||
|
||||
in {
|
||||
appsluggr = out.appsluggr;
|
||||
dnsd = out.dnsd;
|
||||
quickserv = out.quickserv;
|
||||
johaus = out.johaus;
|
||||
license = out.license;
|
||||
|
|
Loading…
Reference in New Issue