From 6db7efe71bae8f92a6a0cbe22e5fe4a972342ed3 Mon Sep 17 00:00:00 2001 From: Christoph Urlacher Date: Tue, 22 Jul 2025 19:24:00 +0200 Subject: [PATCH] Derivations/Unityhub: Add custom unityhub 3.13 derivation with fixed libxml and removed Gconf nixpkgs issues/419634#issuecomment-3052547176 --- derivations/default.nix | 1 + .../unityhub_3_13 => unityhub}/default.nix | 13 ++++++++++--- .../unityhub_3_13 => unityhub}/update.sh | 0 flake.nix | 4 ---- home/christoph/nixinator/default.nix | 4 ++-- overlays/default.nix | 2 +- 6 files changed, 14 insertions(+), 10 deletions(-) rename derivations/{1_deprecated/unityhub_3_13 => unityhub}/default.nix (90%) rename derivations/{1_deprecated/unityhub_3_13 => unityhub}/update.sh (100%) diff --git a/derivations/default.nix b/derivations/default.nix index 0aa3543f..6c7898c1 100644 --- a/derivations/default.nix +++ b/derivations/default.nix @@ -7,5 +7,6 @@ monolisa = pkgs.callPackage ./monolisa {}; msty = pkgs.callPackage ./msty {}; + unityhub = pkgs.callPackage ./unityhub {}; tidal-dl-ng = pkgs.callPackage ./tidal-dl-ng {}; } diff --git a/derivations/1_deprecated/unityhub_3_13/default.nix b/derivations/unityhub/default.nix similarity index 90% rename from derivations/1_deprecated/unityhub_3_13/default.nix rename to derivations/unityhub/default.nix index 1bc52523..cf2ecd7d 100644 --- a/derivations/1_deprecated/unityhub_3_13/default.nix +++ b/derivations/unityhub/default.nix @@ -1,4 +1,3 @@ -# Taken from pull/422785 { lib, stdenv, @@ -47,7 +46,15 @@ stdenv.mkDerivation rec { ++ extraPkgs pkgs; multiPkgs = pkgs: - with pkgs; + with pkgs; let + libxml2-legacy = libxml2.overrideAttrs (previousAttrs: rec { + version = "2.13.8"; + src = fetchurl { + url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz"; + hash = "sha256-J3KUyzMRmrcbK8gfL0Rem8lDW4k60VuyzSsOhZoO6Eo="; + }; + }); + in [ # Unity Hub ldd dependencies cups @@ -94,7 +101,7 @@ stdenv.mkDerivation rec { xorg.libXcursor glib gdk-pixbuf - libxml2 + libxml2-legacy zlib clang git # for git-based packages in unity package manager diff --git a/derivations/1_deprecated/unityhub_3_13/update.sh b/derivations/unityhub/update.sh similarity index 100% rename from derivations/1_deprecated/unityhub_3_13/update.sh rename to derivations/unityhub/update.sh diff --git a/flake.nix b/flake.nix index 437258fe..048a8691 100644 --- a/flake.nix +++ b/flake.nix @@ -77,10 +77,6 @@ # Realtime audio # musnix.url = "github:musnix/musnix"; # musnix.inputs.nixpkgs.follows = "nixpkgs"; - - # Pinned versions - # v4l2loopback-pinned.url = "github:nixos/nixpkgs/4684fd6b0c01e4b7d99027a34c93c2e09ecafee2"; - # unityhub-pinned.url = "github:huantianad/nixpkgs/9542b0bc7701e173a10e6977e57bbba68bb3051f"; }; # Outputs is a function that takes the inputs as arguments. diff --git a/home/christoph/nixinator/default.nix b/home/christoph/nixinator/default.nix index 42c4dfd0..e8711999 100644 --- a/home/christoph/nixinator/default.nix +++ b/home/christoph/nixinator/default.nix @@ -126,7 +126,7 @@ # Unity Stuff # TODO: Unity module - # unityhub # TODO: Wait for https://nixpk.gs/pr-tracker.html?pr=422785 + unityhub rider-unity dotnetCore mono @@ -214,7 +214,7 @@ "com.usebottles.bottles" "io.github.lawstorant.boxflat" - "com.unity.UnityHub" + # "com.unity.UnityHub" ]; overrides = { diff --git a/overlays/default.nix b/overlays/default.nix index 8329b36e..b63b9a11 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -20,7 +20,7 @@ # Overriding specific packages from a different nixpkgs (e.g. a pull request) # can be done like this. Note that this creates an additional nixpkgs instance. # https://github.com/NixOS/nixpkgs/issues/418451 - # unityhub_pinned_3_13 = + # unityhub_3_13 = # (import inputs.unityhub-pinned { # config.allowUnfree = true; # localSystem = {inherit (prev) system;};