From 8d4f8795de81c221e8f58f35b4155b62301b295d Mon Sep 17 00:00:00 2001 From: Mustafa Çalışkan Date: Sat, 8 Jan 2022 21:55:19 +0300 Subject: nix: update package and remove meta section since we are not on nixpkgs --- packages/nix/overlay.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'packages/nix/overlay.nix') diff --git a/packages/nix/overlay.nix b/packages/nix/overlay.nix index 5a494459..c9e0e195 100644 --- a/packages/nix/overlay.nix +++ b/packages/nix/overlay.nix @@ -1,3 +1,5 @@ -self: super: rec { - polymc = super.libsForQt5.callPackage ./polymc {}; -} \ No newline at end of file +{ self }: + +final: prev: rec { + polymc = prev.libsForQt5.callPackage ./polymc { inherit self; }; +} -- cgit From d29d020d6f485852805b7f92d2dabd614d4da2e5 Mon Sep 17 00:00:00 2001 From: Mustafa Çalışkan Date: Sat, 8 Jan 2022 22:15:19 +0300 Subject: {nix,flake}: add submodules --- flake.lock | 36 +++++++++++++++++++++++++++++++++++- flake.nix | 26 ++++++++++++++++++++------ packages/nix/overlay.nix | 8 ++++++-- packages/nix/polymc/default.nix | 9 +++++++++ 4 files changed, 70 insertions(+), 9 deletions(-) (limited to 'packages/nix/overlay.nix') diff --git a/flake.lock b/flake.lock index cb93f3e0..131a9112 100644 --- a/flake.lock +++ b/flake.lock @@ -15,6 +15,22 @@ "type": "github" } }, + "libnbtplusplus": { + "flake": false, + "locked": { + "lastModified": 1591558203, + "narHash": "sha256-QgvNvaoFflCXEPCCFBCeZvYTpuiwScBG7EosUgFwFNQ=", + "owner": "multimc", + "repo": "libnbtplusplus", + "rev": "dc72a20b7efd304d12af2025223fad07b4b78464", + "type": "github" + }, + "original": { + "owner": "multimc", + "repo": "libnbtplusplus", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1641528457, @@ -31,10 +47,28 @@ "type": "github" } }, + "quazip": { + "flake": false, + "locked": { + "lastModified": 1633895098, + "narHash": "sha256-+Of0M2IAoTf1CyC0teCpsyurv6xfqiBo84V49dSeNTA=", + "owner": "multimc", + "repo": "quazip", + "rev": "b1a72ac0bb5a732bf887a535ab75c6f9bedb6b6b", + "type": "github" + }, + "original": { + "owner": "multimc", + "repo": "quazip", + "type": "github" + } + }, "root": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" + "libnbtplusplus": "libnbtplusplus", + "nixpkgs": "nixpkgs", + "quazip": "quazip" } } }, diff --git a/flake.nix b/flake.nix index faa6600e..aa2c2cb5 100644 --- a/flake.nix +++ b/flake.nix @@ -2,8 +2,16 @@ description = "PolyMC flake"; inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; inputs.flake-utils.url = "github:numtide/flake-utils"; + inputs.libnbtplusplus = { + url = "github:multimc/libnbtplusplus"; + flake = false; + }; + inputs.quazip = { + url = "github:multimc/quazip"; + flake = false; + }; - outputs = inputs@{ self, nixpkgs, flake-utils,... }: + outputs = inputs@{ self, nixpkgs, flake-utils, libnbtplusplus, quazip, ... }: flake-utils.lib.eachSystem [ "x86_64-linux" "aarch64-linux" ] (system: let pkgs = import nixpkgs { @@ -11,9 +19,17 @@ }; packages = { - polymc = pkgs.libsForQt5.callPackage ./packages/nix/polymc { inherit self; }; + polymc = pkgs.libsForQt5.callPackage ./packages/nix/polymc { + inherit self; + submoduleQuazip = quazip; + submoduleNbt = libnbtplusplus; + }; + }; + + overlay = import ./packages/nix/overlay.nix { + inherit self quazip libnbtplusplus; }; - + apps = { polymc = flake-utils.lib.mkApp { name = "PolyMC"; @@ -22,11 +38,9 @@ }; in { - inherit packages apps; - + inherit packages overlay apps; defaultPackage = packages.polymc; defaultApp = apps.polymc; - overlay = import ./packages/nix/overlay.nix { inherit self; }; } ); } diff --git a/packages/nix/overlay.nix b/packages/nix/overlay.nix index c9e0e195..a65c23e0 100644 --- a/packages/nix/overlay.nix +++ b/packages/nix/overlay.nix @@ -1,5 +1,9 @@ -{ self }: +{ self, quazip, libnbtplusplus }: final: prev: rec { - polymc = prev.libsForQt5.callPackage ./polymc { inherit self; }; + polymc = prev.libsForQt5.callPackage ./polymc { + inherit self; + submoduleQuazip = quazip; + submoduleNbt = libnbtplusplus; + }; } diff --git a/packages/nix/polymc/default.nix b/packages/nix/polymc/default.nix index 8b5c4812..414835f5 100644 --- a/packages/nix/polymc/default.nix +++ b/packages/nix/polymc/default.nix @@ -14,7 +14,10 @@ , libpulseaudio , qtbase , libGL +# submodules , self +, submoduleNbt +, submoduleQuazip , msaClientID ? "" }: @@ -39,6 +42,12 @@ mkDerivation rec { nativeBuildInputs = [ cmake file makeWrapper ]; buildInputs = [ qtbase jdk8 zlib ]; + postUnpack = '' + mkdir libraries/{libnbtplusplus,quazip} + cp -a ${submoduleNbt}/* libraries/libnbtplusplus + cp -a ${submoduleQuazip}/* libraries/quazip + ''; + postPatch = '' # add client ID substituteInPlace notsecrets/Secrets.cpp \ -- cgit From 6065b4dcf9c084dcea6b317ca3e186d14ad9f26e Mon Sep 17 00:00:00 2001 From: Mustafa Çalışkan Date: Sat, 8 Jan 2022 23:06:56 +0300 Subject: nix: revert overlay changes and add conditionals to derivation for flake build --- flake.nix | 5 ++--- packages/nix/overlay.nix | 8 +------- packages/nix/polymc/default.nix | 22 +++++++++++++++------- 3 files changed, 18 insertions(+), 17 deletions(-) (limited to 'packages/nix/overlay.nix') diff --git a/flake.nix b/flake.nix index aa2c2cb5..2ef65c64 100644 --- a/flake.nix +++ b/flake.nix @@ -21,14 +21,13 @@ packages = { polymc = pkgs.libsForQt5.callPackage ./packages/nix/polymc { inherit self; + isFlakeBuild = true; submoduleQuazip = quazip; submoduleNbt = libnbtplusplus; }; }; - overlay = import ./packages/nix/overlay.nix { - inherit self quazip libnbtplusplus; - }; + overlay = import ./packages/nix/overlay.nix {}; apps = { polymc = flake-utils.lib.mkApp { diff --git a/packages/nix/overlay.nix b/packages/nix/overlay.nix index a65c23e0..6fa701b3 100644 --- a/packages/nix/overlay.nix +++ b/packages/nix/overlay.nix @@ -1,9 +1,3 @@ -{ self, quazip, libnbtplusplus }: - final: prev: rec { - polymc = prev.libsForQt5.callPackage ./polymc { - inherit self; - submoduleQuazip = quazip; - submoduleNbt = libnbtplusplus; - }; + polymc = prev.libsForQt5.callPackage ./polymc {}; } diff --git a/packages/nix/polymc/default.nix b/packages/nix/polymc/default.nix index 340c1ae5..c55c8a3c 100644 --- a/packages/nix/polymc/default.nix +++ b/packages/nix/polymc/default.nix @@ -15,9 +15,10 @@ , qtbase , libGL # submodules -, self -, submoduleNbt -, submoduleQuazip +, isFlakeBuild ? false +, self ? "" +, submoduleNbt ? "" +, submoduleQuazip ? "" }: let @@ -34,19 +35,26 @@ in mkDerivation rec { pname = "polymc"; - version = "nightly"; + version = if isFlakeBuild then "nightly" else "1.0.4"; - src = lib.cleanSource self; + src = if isFlakeBuild then lib.cleanSource self + else fetchFromGitHub { + owner = "PolyMC"; + repo = "PolyMC"; + rev = "${version}"; + sha256 = "sha256-8aya0KfV9F+i2qBpweWcR9hwyTSQkqn2wHdtkCEeNvk="; + fetchSubmodules = true; + }; nativeBuildInputs = [ cmake file makeWrapper ]; buildInputs = [ qtbase jdk8 zlib ]; - postUnpack = '' + postUnpack = if isFlakeBuild then '' mkdir source/libraries/{libnbtplusplus,quazip} cp -a ${submoduleNbt}/* source/libraries/libnbtplusplus cp -a ${submoduleQuazip}/* source/libraries/quazip chmod a+r+w source/libraries/{libnbtplusplus,quazip}/* - ''; + '' else ""; cmakeFlags = [ "-DLauncher_LAYOUT=lin-system" -- cgit From 2a760a8e32627617dc80c96c9598ad3ed34ffbc8 Mon Sep 17 00:00:00 2001 From: Mustafa Çalışkan Date: Sat, 8 Jan 2022 23:09:53 +0300 Subject: Revert "nix: revert overlay changes and add conditionals to derivation for flake build" --- flake.nix | 5 +++-- packages/nix/overlay.nix | 8 +++++++- packages/nix/polymc/default.nix | 22 +++++++--------------- 3 files changed, 17 insertions(+), 18 deletions(-) (limited to 'packages/nix/overlay.nix') diff --git a/flake.nix b/flake.nix index 2ef65c64..aa2c2cb5 100644 --- a/flake.nix +++ b/flake.nix @@ -21,13 +21,14 @@ packages = { polymc = pkgs.libsForQt5.callPackage ./packages/nix/polymc { inherit self; - isFlakeBuild = true; submoduleQuazip = quazip; submoduleNbt = libnbtplusplus; }; }; - overlay = import ./packages/nix/overlay.nix {}; + overlay = import ./packages/nix/overlay.nix { + inherit self quazip libnbtplusplus; + }; apps = { polymc = flake-utils.lib.mkApp { diff --git a/packages/nix/overlay.nix b/packages/nix/overlay.nix index 6fa701b3..a65c23e0 100644 --- a/packages/nix/overlay.nix +++ b/packages/nix/overlay.nix @@ -1,3 +1,9 @@ +{ self, quazip, libnbtplusplus }: + final: prev: rec { - polymc = prev.libsForQt5.callPackage ./polymc {}; + polymc = prev.libsForQt5.callPackage ./polymc { + inherit self; + submoduleQuazip = quazip; + submoduleNbt = libnbtplusplus; + }; } diff --git a/packages/nix/polymc/default.nix b/packages/nix/polymc/default.nix index c55c8a3c..340c1ae5 100644 --- a/packages/nix/polymc/default.nix +++ b/packages/nix/polymc/default.nix @@ -15,10 +15,9 @@ , qtbase , libGL # submodules -, isFlakeBuild ? false -, self ? "" -, submoduleNbt ? "" -, submoduleQuazip ? "" +, self +, submoduleNbt +, submoduleQuazip }: let @@ -35,26 +34,19 @@ in mkDerivation rec { pname = "polymc"; - version = if isFlakeBuild then "nightly" else "1.0.4"; + version = "nightly"; - src = if isFlakeBuild then lib.cleanSource self - else fetchFromGitHub { - owner = "PolyMC"; - repo = "PolyMC"; - rev = "${version}"; - sha256 = "sha256-8aya0KfV9F+i2qBpweWcR9hwyTSQkqn2wHdtkCEeNvk="; - fetchSubmodules = true; - }; + src = lib.cleanSource self; nativeBuildInputs = [ cmake file makeWrapper ]; buildInputs = [ qtbase jdk8 zlib ]; - postUnpack = if isFlakeBuild then '' + postUnpack = '' mkdir source/libraries/{libnbtplusplus,quazip} cp -a ${submoduleNbt}/* source/libraries/libnbtplusplus cp -a ${submoduleQuazip}/* source/libraries/quazip chmod a+r+w source/libraries/{libnbtplusplus,quazip}/* - '' else ""; + ''; cmakeFlags = [ "-DLauncher_LAYOUT=lin-system" -- cgit From 9499acedabb77e9783fd78bd0c9a24112ce1c319 Mon Sep 17 00:00:00 2001 From: Mustafa Çalışkan Date: Sat, 8 Jan 2022 23:23:55 +0300 Subject: nix: fix overlay --- flake.nix | 6 +++--- packages/nix/overlay.nix | 9 --------- packages/nix/polymc/default.nix | 1 + 3 files changed, 4 insertions(+), 12 deletions(-) delete mode 100644 packages/nix/overlay.nix (limited to 'packages/nix/overlay.nix') diff --git a/flake.nix b/flake.nix index aa2c2cb5..b30008a4 100644 --- a/flake.nix +++ b/flake.nix @@ -26,9 +26,9 @@ }; }; - overlay = import ./packages/nix/overlay.nix { - inherit self quazip libnbtplusplus; - }; + overlay = (final: prev: rec { + polymc = packages.polymc; + }); apps = { polymc = flake-utils.lib.mkApp { diff --git a/packages/nix/overlay.nix b/packages/nix/overlay.nix deleted file mode 100644 index a65c23e0..00000000 --- a/packages/nix/overlay.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ self, quazip, libnbtplusplus }: - -final: prev: rec { - polymc = prev.libsForQt5.callPackage ./polymc { - inherit self; - submoduleQuazip = quazip; - submoduleNbt = libnbtplusplus; - }; -} diff --git a/packages/nix/polymc/default.nix b/packages/nix/polymc/default.nix index 340c1ae5..92097442 100644 --- a/packages/nix/polymc/default.nix +++ b/packages/nix/polymc/default.nix @@ -42,6 +42,7 @@ mkDerivation rec { buildInputs = [ qtbase jdk8 zlib ]; postUnpack = '' + rm -rf source/libraries/{libnbtplusplus,quazip} mkdir source/libraries/{libnbtplusplus,quazip} cp -a ${submoduleNbt}/* source/libraries/libnbtplusplus cp -a ${submoduleQuazip}/* source/libraries/quazip -- cgit