Simmer/nixos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add citrix fixes

Browse Source
This commit is contained in:
Ethan Simmons
2024-10-20 15:14:05 -05:00
parent 7e3cbdf0cb
commit dff532246f
4 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
flake.lock generated
View File

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

2
flake.nix
View File

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

12
overlays/citrix.nix Normal file
View File

@@ -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)
];
});
};
};
}

1
overlays/default.nix
View File

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