Compare commits

..

5 Commits

4 changed files with 61 additions and 12 deletions

View File

@ -16,6 +16,11 @@ If you have suggestions on "fixing" or "cleaning up" my configurations, please a
- [[githubL:ashebanow Starred - Example Nix Configs] "These are other people's nix configs I've found useful, informative, and/or inspirational."](https://github.com/stars/ashebanow/lists/example-nix-configs/) - [[githubL:ashebanow Starred - Example Nix Configs] "These are other people's nix configs I've found useful, informative, and/or inspirational."](https://github.com/stars/ashebanow/lists/example-nix-configs/)
### Notes for possible future use: ### Notes for possible future use:
`/run/udev/rules.d` exists. Might be good to remember.
-------------------------------
I really really should look further into these before actually using them. I really really should look further into these before actually using them.
```nix ```nix
virtualisation.docker = { virtualisation.docker = {

View File

@ -85,11 +85,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1716930911, "lastModified": 1717097707,
"narHash": "sha256-t4HT5j3Jy7skRB5PINnxcEBCkgE89rGBpwTI7YS4Ffo=", "narHash": "sha256-HC5vJ3oYsjwsCaSbkIPv80e4ebJpNvFKQTBOGlHvjLs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a9b36cbe9292a649222b89fdb9ae9907e9c74086", "rev": "0eb314b4f0ba337e88123e0b1e57ef58346aafd9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -129,11 +129,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1716856858, "lastModified": 1717036776,
"narHash": "sha256-dfNGs2AW/V31nMVeEBSUJCMfT6bZAKJ5qsWgFHWhvUc=", "narHash": "sha256-joKTxvywYlKspGGKOIXho6oRbggOPyayEqAyuZCavO0=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "38f31ee7c1a60adae58833789dd855c128b056c6", "rev": "b4b38e6b5fe18da9464f291ae5fbf2ea9acb9ccb",
"revCount": 85, "revCount": 86,
"type": "git", "type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module" "url": "https://git.lix.systems/lix-project/nixos-module"
}, },
@ -204,11 +204,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1716769173, "lastModified": 1716948383,
"narHash": "sha256-7EXDb5WBw+d004Agt+JHC/Oyh/KTUglOaQ4MNjBbo5w=", "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9ca3f649614213b2aaf5f1e16ec06952fe4c2632", "rev": "ad57eef4ef0659193044870c731987a6df5cf56b",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -54,9 +54,26 @@ stdenv.mkDerivation {
"-DINSTALL_APPARMOR=OFF" "-DINSTALL_APPARMOR=OFF"
]; ];
/*
About "postPatch"... patches.
"src/librpsecure/os-secure_linux.c" change is needed to complete the
build as it's not being detected automatically. (WSL Issue????)
"src/rp-stub/CMakeLists.txt" change is needed to properly symlink
`result/libexec/rp-thumbnail` to `result/bin/rp-stub` due to the odd
double-path bug as described in
https://github.com/NixOS/nixpkgs/issues/144170
# CMake incorrect absolute include/lib paths tracking issue
https://github.com/NixOS/nixpkgs/pull/172347 and
# cmake: add check-pc-files hook to check broken pc files
https://github.com/NixOS/nixpkgs/pull/247474
# cmake: make check-pc-files hook also check .cmake files
*/
postPatch = '' postPatch = ''
substituteInPlace "src/librpsecure/os-secure_linux.c" \ substituteInPlace "src/librpsecure/os-secure_linux.c" \
--replace "SCMP_SYS(write)," "SCMP_SYS(write), SCMP_SYS(getdents64)," --replace-fail "SCMP_SYS(write)," \
"SCMP_SYS(write), SCMP_SYS(getdents64),"
substituteInPlace "src/rp-stub/CMakeLists.txt" \
--replace-fail "{CMAKE_INSTALL_PREFIX}/\$" ""
''; '';
meta = { meta = {
@ -68,3 +85,30 @@ stdenv.mkDerivation {
platforms = lib.platforms.all; platforms = lib.platforms.all;
}; };
} }
/*
Notes:
"$STORE_PATH" in these notes reference "nix/store/pnyxqz1vi124i18zdbl8ad1vypai73yg-rom-properties-git"
"$CMAKE_INSTALL_BINDIR" matches variable in Cmake flags
"$CMAKE_INSTALL_LIBDIR" matches variable in Cmake flags
"$CMAKE_INSTALL_LIBEXECDIR" matches variable in Cmake flags
=============================================================
/$CMAKE_INSTALL_LIBDIR/debug/$STORE_PATH/$CMAKE_INSTALL_LIBEXECDIR/rp-download.debug
/$CMAKE_INSTALL_LIBDIR/debug/$STORE_PATH/$CMAKE_INSTALL_LIBDIR/libromdata.debug
/$CMAKE_INSTALL_LIBDIR/debug/$STORE_PATH/$CMAKE_INSTALL_BINDIR/rpcli.debug
/$CMAKE_INSTALL_LIBDIR/debug/$STORE_PATH/$CMAKE_INSTALL_BINDIR/rp-thumbnail.debug
/$CMAKE_INSTALL_LIBDIR/debug/$STORE_PATH/$CMAKE_INSTALL_BINDIR/rp-config.debug
What I think I want the debug paths to end up as:
$CMAKE_INSTALL_LIBDIR/debug/libexec/rp-download.debug
$CMAKE_INSTALL_LIBDIR/debug/lib/libromdata.debug
$CMAKE_INSTALL_LIBDIR/debug/bin/rpcli.debug
$CMAKE_INSTALL_LIBDIR/debug/bin/rp-thumbnail.debug
$CMAKE_INSTALL_LIBDIR/debug/bin/rp-config.debug
... Do I even need to build the debug executables anyway?
*/

View File

@ -125,8 +125,8 @@ in
my_packages.ps3dec my_packages.ps3dec
my_packages.sabretools my_packages.sabretools
my_packages.new_rclone my_packages.new_rclone
my_packages.rom-properties
# my_packages.hactoolnet-bin # my_packages.hactoolnet-bin
# my_packages.rom-properties
agenix.packages.${system}.default agenix.packages.${system}.default
xil.packages.${system}.xil xil.packages.${system}.xil