Add citrix fixes

flake.lock

@@ -64,11 +64,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1728726232,
-        "narHash": "sha256-8ZWr1HpciQsrFjvPMvZl0W+b0dilZOqXPoKa2Ux36bc=",
+        "lastModified": 1729260213,
+        "narHash": "sha256-jAvHoU/1y/yCuXzr2fNF+q6uKmr8Jj2xgAisK4QB9to=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d57112db877f07387ce7104b5ac346ede556d2d7",
+        "rev": "09a0c0c02953318bf94425738c7061ffdc4cba75",
         "type": "github"
       },
       "original": {
@@ -83,11 +83,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1728789086,
-        "narHash": "sha256-xynAUQXdsjZaGh/oS4p65zTQhMzs87cAlHyzMYLlG0I=",
+        "lastModified": 1729251238,
+        "narHash": "sha256-CiWm577XgvxJUCLvIhsKDsnybFoQGel6kcC4QZR2f1M=",
         "owner": "ggerganov",
         "repo": "llama.cpp",
-        "rev": "92be9f12164f18ce845a5bab60cefa5f7fec6836",
+        "rev": "afd9909a6481402844aecefa8a8908afdd7f52f1",
         "type": "github"
       },
       "original": {
@@ -126,11 +126,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1728627514,
-        "narHash": "sha256-r+SF9AnHrTg+bk6YszoKfV9lgyw+yaFUQe0dOjI0Z2o=",
+        "lastModified": 1729044727,
+        "narHash": "sha256-GKJjtPY+SXfLF/yTN7M2cAnQB6RERFKnQhD8UvPSf3M=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c505ebf777526041d792a49d5f6dd4095ea391a7",
+        "rev": "dc2e0028d274394f73653c7c90cc63edbb696be1",
         "type": "github"
       },
       "original": {
@@ -158,11 +158,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1728492678,
-        "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
+        "lastModified": 1728888510,
+        "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
+        "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c",
         "type": "github"
       },
       "original": {

flake.nix

@@ -190,7 +190,7 @@
 
                     pkgs = import nixpkgs {
                         inherit system;
-                        overlays = with overlays; [ printrun llama-cpp ];
+                        overlays = with overlays; [ printrun llama-cpp citrix ];
                         config.allowUnfree = true;
                     };
 

overlays/citrix.nix

@@ -0,0 +1,12 @@
+final: prev: {
+  # https://github.com/NixOS/nixpkgs/issues/348868
+  citrix_workspace_23_09_0 = prev.citrix_workspace_23_09_0.override {
+    libvorbis = final.libvorbis.override {
+      libogg = final.libogg.overrideAttrs (prevAttrs: {
+        cmakeFlags = (if prevAttrs ? cmakeFlags then prevAttrs.cmakeFlags else []) ++ [
+          (final.lib.cmakeBool "BUILD_SHARED_LIBS" true)
+        ];
+      });
+    };
+  };
+}

overlays/default.nix

@@ -4,4 +4,5 @@
     nose = import ./nose.nix;
     llama-cpp = import ./llama-cpp.nix { inherit inputs; };
     printrun = import ./printrun.nix { inherit inputs; };
+    citrix = import ./citrix.nix;
 }