Merge pull request #4 from niscolas/main

Updates logic due to removal of the "objects_list" dictionary in the original patch script
This commit is contained in:
Robin Appelman 2024-01-30 15:54:28 +01:00 committed by GitHub
commit dbdff6fab7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 9 additions and 17 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

@ -34,9 +34,8 @@
... ...
}: let }: let
patchList = importJSON "${jsons}/${prefix}patch-list.json"; patchList = importJSON "${jsons}/${prefix}patch-list.json";
objectList = importJSON "${jsons}/${prefix}object-list.json";
patch = patchList.${version}; patch = patchList.${version};
object = objectList.${version}; object = "libnvidia-encode.so";
in { in {
preFixup = preFixup =
preFixup preFixup