fix(nix): add tomlplusplus
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
This commit is contained in:
		
							
								
								
									
										19
									
								
								flake.lock
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										19
									
								
								flake.lock
									
									
									
										generated
									
									
									
								
							@@ -52,7 +52,24 @@
 | 
			
		||||
      "inputs": {
 | 
			
		||||
        "flake-compat": "flake-compat",
 | 
			
		||||
        "libnbtplusplus": "libnbtplusplus",
 | 
			
		||||
        "nixpkgs": "nixpkgs"
 | 
			
		||||
        "nixpkgs": "nixpkgs",
 | 
			
		||||
        "tomlplusplus": "tomlplusplus"
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "tomlplusplus": {
 | 
			
		||||
      "flake": false,
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1664034574,
 | 
			
		||||
        "narHash": "sha256-EFMAl6tsTvkgK0DWC/pZfOIq06b2e5SnxJa1ngGRIQA=",
 | 
			
		||||
        "owner": "marzer",
 | 
			
		||||
        "repo": "tomlplusplus",
 | 
			
		||||
        "rev": "8aa5c8b2a4ff2c440d4630addf64fa4f62146170",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
        "owner": "marzer",
 | 
			
		||||
        "repo": "tomlplusplus",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      }
 | 
			
		||||
    }
 | 
			
		||||
  },
 | 
			
		||||
 
 | 
			
		||||
@@ -5,9 +5,10 @@
 | 
			
		||||
    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
 | 
			
		||||
    flake-compat = { url = "github:edolstra/flake-compat"; flake = false; };
 | 
			
		||||
    libnbtplusplus = { url = "github:PolyMC/libnbtplusplus"; flake = false; };
 | 
			
		||||
    tomlplusplus = { url = "github:marzer/tomlplusplus"; flake = false; };
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  outputs = { self, nixpkgs, libnbtplusplus, ... }:
 | 
			
		||||
  outputs = { self, nixpkgs, libnbtplusplus, tomlplusplus, ... }:
 | 
			
		||||
    let
 | 
			
		||||
      # User-friendly version number.
 | 
			
		||||
      version = builtins.substring 0 8 self.lastModifiedDate;
 | 
			
		||||
@@ -22,8 +23,8 @@
 | 
			
		||||
      pkgs = forAllSystems (system: nixpkgs.legacyPackages.${system});
 | 
			
		||||
 | 
			
		||||
      packagesFn = pkgs: rec {
 | 
			
		||||
        polymc = pkgs.libsForQt5.callPackage ./nix { inherit version self libnbtplusplus; };
 | 
			
		||||
        polymc-qt6 = pkgs.qt6Packages.callPackage ./nix { inherit version self libnbtplusplus; };
 | 
			
		||||
        polymc = pkgs.libsForQt5.callPackage ./nix { inherit version self libnbtplusplus tomlplusplus; };
 | 
			
		||||
        polymc-qt6 = pkgs.qt6Packages.callPackage ./nix { inherit version self libnbtplusplus tomlplusplus; };
 | 
			
		||||
      };
 | 
			
		||||
    in
 | 
			
		||||
    {
 | 
			
		||||
 
 | 
			
		||||
@@ -21,6 +21,7 @@
 | 
			
		||||
, self
 | 
			
		||||
, version
 | 
			
		||||
, libnbtplusplus
 | 
			
		||||
, tomlplusplus
 | 
			
		||||
, enableLTO ? false
 | 
			
		||||
}:
 | 
			
		||||
 | 
			
		||||
@@ -59,6 +60,11 @@ stdenv.mkDerivation rec {
 | 
			
		||||
    mkdir source/libraries/libnbtplusplus
 | 
			
		||||
    cp -a ${libnbtplusplus}/* source/libraries/libnbtplusplus
 | 
			
		||||
    chmod a+r+w source/libraries/libnbtplusplus/*
 | 
			
		||||
    # Copy tomlplusplus
 | 
			
		||||
    rm -rf source/libraries/tomlplusplus
 | 
			
		||||
    mkdir source/libraries/tomlplusplus
 | 
			
		||||
    cp -a ${tomlplusplus}/* source/libraries/tomlplusplus
 | 
			
		||||
    chmod a+r+w source/libraries/tomlplusplus/*
 | 
			
		||||
  '';
 | 
			
		||||
 | 
			
		||||
  cmakeFlags = [
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user