colin
/
nix-files
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

nixpkgs: 2024-03-06 -> 2024-03-07 

```
• Updated input 'nixpkgs-next-unpatched':
    'github:nixos/nixpkgs/09c267dae0dae6585ddbc98bd2301bd8153ac177' (2024-03-06)
  → 'github:nixos/nixpkgs/5e0cda94371075bead6d953e8a60a717ec022524' (2024-03-07)
• Updated input 'nixpkgs-unpatched':
    'github:nixos/nixpkgs/a85303aef29c6a9000a259ed21c9c14a1aa3859e' (2024-03-06)
  → 'github:nixos/nixpkgs/90714b18a06ddad90159cc312814f1871509e10e' (2024-03-07)
```
This commit is contained in:
Colin 2024-03-07 11:13:43 +00:00
parent cb1c76a0db
commit 3cf651b212
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
flake.lock
View File

@ -19,11 +19,11 @@
},
"nixpkgs-next-unpatched": {
"locked": {
"lastModified": 1709704879,
"narHash": "sha256-gjdEHcFTFT5RlhoKSvABD3giCUs5/tHPeklXjzbpYVA=",
"lastModified": 1709805514,
"narHash": "sha256-AenreYConPr2/kyljat9uJPHlQTwj4q5HdpoBmezbEw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "09c267dae0dae6585ddbc98bd2301bd8153ac177",
"rev": "5e0cda94371075bead6d953e8a60a717ec022524",
"type": "github"
},
"original": {
@ -51,11 +51,11 @@
},
"nixpkgs-unpatched": {
"locked": {
"lastModified": 1709718694,
"narHash": "sha256-22NG5QXlB5oQWwgMxlEPow+zp7JwCzhF9QMB52Mi3k0=",
"lastModified": 1709809582,
"narHash": "sha256-QL3tLWK8oybb/l1HXmCHuhBGDR+w5i4uM8r0VVBu8ZQ=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "a85303aef29c6a9000a259ed21c9c14a1aa3859e",
"rev": "90714b18a06ddad90159cc312814f1871509e10e",
"type": "github"
},
"original": {

14
pkgs/additional/koreader-from-src/default.nix
View File

@ -192,12 +192,6 @@ let
# - -I${ZLIB_DIR}/include
zlibAll = fhsLib zlib { lib=false; include=true; flatLib=true; flatInclude=true; contrib=true; };
libunibreak' = libunibreak.overrideAttrs (canon: {
patches = (canon.patches or []) ++ [
"${src}/base/thirdparty/libunibreak/add_lb_get_char_class.patch"
];
});
# values to provide to koreader/base/Makefile.defs.
# should be ok to put this in `makeFlags` array, but i can't get that to work!
# LUAROCKS_BINARY substitution is to support the cross-compilation case (i.e. emulate it during the build process)
@ -230,9 +224,9 @@ let
TURBOJPEG_LIB="${lib.getLib libjpeg_turbo}/lib/libturbojpeg.so" \
LIBICONV="${lib.getLib libiconvReal}/lib/libiconv.so" \
LIBICONV_DIR="${lib.getDev libiconvReal}" \
LIBUNIBREAK_LIB="${lib.getLib libunibreak'}/lib/libunibreak.so" \
LIBUNIBREAK_DIR="${libAndDev libunibreak'}" \
LIBUNIBREAK_LIB_LINK_FLAG="-L ${lib.getLib libunibreak'}/lib -l:libunibreak.so" \
LIBUNIBREAK_LIB="${lib.getLib libunibreak}/lib/libunibreak.so" \
LIBUNIBREAK_DIR="${libAndDev libunibreak}" \
LIBUNIBREAK_LIB_LINK_FLAG="-L ${lib.getLib libunibreak}/lib -l:libunibreak.so" \
LIBWEBP_LIB="${lib.getLib libwebp}/lib/libwebp.so" \
LIBWEBPDEMUX_LIB="${lib.getLib libwebp}/lib/libwebpdemux.so" \
LIBWEBPSHARPYUV_LIB="${lib.getLib libwebp}/lib/libwebpsharpyuv.so" \
@ -297,7 +291,7 @@ let
libiconvReal
libjpeg_turbo
libpng
libunibreak'
libunibreak
libwebp
openssl
openssh