diff --git a/default.nix b/default.nix index 394c765..63e583e 100644 --- a/default.nix +++ b/default.nix @@ -1,7 +1,4 @@ -# default.nix -let - pkgs = import { config = {}; overlays = []; }; -in +{pkgs,...}: { xbuild = pkgs.callPackage ./pkgs/x/xbuild/package.nix {}; cedro = pkgs.callPackage ./pkgs/c/cedro/package.nix {}; diff --git a/flake.nix b/flake.nix index c9c9137..b680291 100644 --- a/flake.nix +++ b/flake.nix @@ -13,9 +13,9 @@ { packages = forAllSystems (system: let pkgs = nixpkgs.legacyPackages.${system}; - in { - xbuild = pkgs.callPackage ./pkgs/x/xbuild/package.nix {}; - cedro = pkgs.callPackage ./pkgs/c/cedro/package.nix {}; - }); + in + import ./default.nix { inherit pkgs; }); }; } + + diff --git a/pkgs/c/cedro/package.nix b/pkgs/c/cedro/package.nix new file mode 100644 index 0000000..b35364a --- /dev/null +++ b/pkgs/c/cedro/package.nix @@ -0,0 +1,29 @@ +# cedro.nix +{ + lib, + stdenv, + fetchFromGitHub, + zip, + ... +}: + +stdenv.mkDerivation { + pname = "cedro"; + version = "0.0.1"; + + src = fetchFromGitHub { + owner = "shen390s"; + repo = "cedro"; + rev = "master"; + sha256 = "sha256-DLq7vC+4k2TMy5jKvQkFTy+xZmpvl0+DiWcd7CBVbgw="; + }; + + nativeBuildInputs = [ + zip + ]; + + installPhase = '' + mkdir -p $out/bin + cp bin/* $out/bin + ''; +} diff --git a/pkgs/x/xbuild/package.nix b/pkgs/x/xbuild/package.nix index 11c3093..ee34b20 100644 --- a/pkgs/x/xbuild/package.nix +++ b/pkgs/x/xbuild/package.nix @@ -6,6 +6,7 @@ autoconf, automake, libtool, + ... }: stdenv.mkDerivation {