Xeorg
/
nixpkgs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix build

This commit is contained in:
Cadey Ratio 2020-03-17 07:57:28 -04:00
parent 1c2ff72eb1
commit b605d30899
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
default.nix
View File

@ -4,11 +4,9 @@ let
callPackage = pkgs.lib.callPackageWith (pkgs // self); callPackage = pkgs.lib.callPackageWith (pkgs // self);
x = callPackage ./pkgs/x { }; x = callPackage ./pkgs/x { };
quickserv = callPackage sources.quickserv { }; quickserv = callPackage sources.quickserv { };
dhall = callPackage sources.easy-dhall-nix { };
self = { self = {
# nix tools # nix tools
dhallToNix = import ./pkgs/dhallToNix.nix;
dockerImage = callPackage ./pkgs/dockerImage.nix { }; dockerImage = callPackage ./pkgs/dockerImage.nix { };
srcNoTarget = import ./pkgs/srcNoTarget.nix; srcNoTarget = import ./pkgs/srcNoTarget.nix;
@ -19,13 +17,6 @@ let
MoonPlus = callPackage ./pkgs/moonplus { }; MoonPlus = callPackage ./pkgs/moonplus { };
minica = callPackage ./pkgs/minica { }; 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 # lojban
johaus = callPackage ./pkgs/johaus { }; johaus = callPackage ./pkgs/johaus { };
jvozba = callPackage ./pkgs/jvozba { }; jvozba = callPackage ./pkgs/jvozba { };
@ -38,6 +29,7 @@ let
# x # x
appsluggr = x.appsluggr; appsluggr = x.appsluggr;
dnsd = x.dnsd;
license = x.license; license = x.license;
mainsanow = x.mainsanow; mainsanow = x.mainsanow;
prefix = x.prefix; prefix = x.prefix;

4
pkgs/x/default.nix
View File

@ -20,6 +20,7 @@ let
subPackages = [ subPackages = [
"cmd/appsluggr" "cmd/appsluggr"
"cmd/dnsd"
"cmd/johaus" "cmd/johaus"
"cmd/license" "cmd/license"
"cmd/mainsanow" "cmd/mainsanow"
@ -30,6 +31,7 @@ let
outputs = [ outputs = [
"out" # keep the default output but don't use it "out" # keep the default output but don't use it
"appsluggr" "appsluggr"
"dnsd"
"johaus" "johaus"
"license" "license"
"mainsanow" "mainsanow"
@ -40,6 +42,7 @@ let
installPhase = '' installPhase = ''
dir=$GOPATH/bin dir=$GOPATH/bin
install -D $dir/appsluggr $appsluggr/bin/appsluggr install -D $dir/appsluggr $appsluggr/bin/appsluggr
install -D $dir/dnsd $dnsd/bin/dnsd
install -D $dir/johaus $johaus/bin/johaus install -D $dir/johaus $johaus/bin/johaus
install -D $dir/license $license/bin/license install -D $dir/license $license/bin/license
install -D $dir/mainsanow $mainsanow/bin/mainsanow install -D $dir/mainsanow $mainsanow/bin/mainsanow
@ -52,6 +55,7 @@ let
in { in {
appsluggr = out.appsluggr; appsluggr = out.appsluggr;
dnsd = out.dnsd;
quickserv = out.quickserv; quickserv = out.quickserv;
johaus = out.johaus; johaus = out.johaus;
license = out.license; license = out.license;