misc: changes object directly to "libnvidia-encode.so"

This commit is contained in:
niscolas 2023-12-18 20:27:37 -03:00
commit 895139b9a1
3 changed files with 11 additions and 25 deletions

View file

@ -27,17 +27,9 @@ stdenv.mkDerivation rec {
patch -p1 < ${./extract-patch-list.diff} patch -p1 < ${./extract-patch-list.diff}
bash patch.sh > patch-list.json bash patch.sh > patch-list.json
cp ${src}/patch.sh patch.sh
patch -p1 < ${./extract-object-list.diff}
bash patch.sh > object-list.json
cp ${src}/patch-fbc.sh patch.sh cp ${src}/patch-fbc.sh patch.sh
patch -p1 < ${./extract-patch-list.diff} patch -p1 < ${./extract-patch-list.diff}
bash patch.sh > fbc-patch-list.json bash patch.sh > fbc-patch-list.json
cp ${src}/patch-fbc.sh patch.sh
patch -p1 < ${./extract-object-list.diff}
bash patch.sh > fbc-object-list.json
''; '';
installPhase = '' installPhase = ''

15
flake.lock generated
View file

@ -2,17 +2,18 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1674902473, "lastModified": 1702780907,
"narHash": "sha256-MdKJeeDTjCtmoVPWLEDg10jgknt6rqTO3c1WeNQtho4=", "narHash": "sha256-blbrBBXjjZt6OKTcYX1jpe9SRof2P9ZYWPzq22tzXAA=",
"owner": "NixOS", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "548896f4d9f7db2f7205d82727d6c03c86d2f896", "rev": "1e2e384c5b7c50dbf8e9c441a9e58d85f408b01f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "owner": "nixos",
"ref": "release-22.11", "ref": "nixos-23.11",
"type": "indirect" "repo": "nixpkgs",
"type": "github"
} }
}, },
"root": { "root": {

View file

@ -1,7 +1,7 @@
{ {
inputs = { inputs = {
utils.url = "github:numtide/flake-utils"; utils.url = "github:numtide/flake-utils";
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; nixpkgs.url = "nixpkgs/release-23.05";
}; };
outputs = { outputs = {
@ -35,19 +35,12 @@
}: let }: let
patchList = importJSON "${jsons}/${prefix}patch-list.json"; patchList = importJSON "${jsons}/${prefix}patch-list.json";
patch = patchList.${version}; patch = patchList.${version};
object = "libnvidia-encode.so";
in { in {
preFixup = preFixup =
preFixup preFixup
+ '' + ''
version=${version} sed -i '${patch}' $out/lib/${object}.${version}
driver_maj_version=''${version%%.*}
if [[ $driver_maj_version -ge "415" && $driver_maj_version -le "435" ]]; then
object='libnvcuvid.so'
else
object='libnvidia-encode.so'
fi
sed -i '${patch}' $out/lib/''${object}.''${version}
''; '';
}); });
in { in {