diff options
| author | Mustafa Çalışkan <muscaln@protonmail.com> | 2022-01-08 23:09:53 +0300 |
|---|---|---|
| committer | Mustafa Çalışkan <muscaln@protonmail.com> | 2022-01-08 23:09:53 +0300 |
| commit | 2a760a8e32627617dc80c96c9598ad3ed34ffbc8 (patch) | |
| tree | 9b3d414d236b1588abf42bf473f4fdd9a7074540 /packages | |
| parent | 6065b4dcf9c084dcea6b317ca3e186d14ad9f26e (diff) | |
| download | PrismLauncher-2a760a8e32627617dc80c96c9598ad3ed34ffbc8.tar.gz PrismLauncher-2a760a8e32627617dc80c96c9598ad3ed34ffbc8.tar.bz2 PrismLauncher-2a760a8e32627617dc80c96c9598ad3ed34ffbc8.zip | |
Revert "nix: revert overlay changes and add conditionals to derivation for flake build"
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/nix/overlay.nix | 8 | ||||
| -rw-r--r-- | packages/nix/polymc/default.nix | 22 |
2 files changed, 14 insertions, 16 deletions
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" |