aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSefa Eyeoglu <contact@scrumplex.net>2022-09-26 15:42:45 +0200
committerSefa Eyeoglu <contact@scrumplex.net>2022-09-26 15:42:45 +0200
commit0f59a1dde12f94eaff71f6f6b3d8d271c2dcce26 (patch)
tree369f9a6ed222120c29929f69c8636a35e17572eb
parent7c6bb80cee123d7bdd140d2892a3f473f972ebc8 (diff)
downloadPrismLauncher-0f59a1dde12f94eaff71f6f6b3d8d271c2dcce26.tar.gz
PrismLauncher-0f59a1dde12f94eaff71f6f6b3d8d271c2dcce26.tar.bz2
PrismLauncher-0f59a1dde12f94eaff71f6f6b3d8d271c2dcce26.zip
fix(nix): add tomlplusplus
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
-rw-r--r--flake.lock19
-rw-r--r--flake.nix7
-rw-r--r--nix/default.nix6
3 files changed, 28 insertions, 4 deletions
diff --git a/flake.lock b/flake.lock
index bfc9ac6d..a72286bb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -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"
}
}
},
diff --git a/flake.nix b/flake.nix
index 51bc1fda..93192725 100644
--- a/flake.nix
+++ b/flake.nix
@@ -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
{
diff --git a/nix/default.nix b/nix/default.nix
index 42ddda18..88b540ab 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -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 = [