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

nixpkgs: 2024-04-24 -> 2024-04-26, nixpkgs-wayland

Browse Source 
```
• Updated input 'nixpkgs-next-unpatched':
    'github:nixos/nixpkgs/acba655f267a49327f2cea95003f17b8540909c0' (2024-04-24)
  → 'github:nixos/nixpkgs/7d3f4eadec32d447a5f20d87fa309f00986cb288' (2024-04-26)
• Updated input 'nixpkgs-unpatched':
    'github:nixos/nixpkgs/1eb9a6980dee3970850f47ba8139c7402f54a9a0' (2024-04-24)
  → 'github:nixos/nixpkgs/0b868df4ced96400774414f5baf30b696215b98f' (2024-04-26)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/80659e4b2805654de851996e682b063a5d7eea5e' (2024-04-24)
  → 'github:nix-community/nixpkgs-wayland/ca9d278400c170935a95dd75e7e2537c2afd1cb7' (2024-04-26)
```
This commit is contained in:
Colin 2024-04-26 21:07:35 +00:00
parent 79bba42768
commit 547d71c19a
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
flake.lock
View File

@ -167,11 +167,11 @@
},
"nixpkgs-next-unpatched": {
"locked": {
"lastModified": 1713963406,
"narHash": "sha256-UjESu2rC2UTxXIeYeRQrm6EwEuz8W0i66RMzVP4ocsw=",
"lastModified": 1714164575,
"narHash": "sha256-qD6v6JaJcEecszEekUsq09lOg4p+C0B4xOjXctKSNSQ=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "acba655f267a49327f2cea95003f17b8540909c0",
"rev": "7d3f4eadec32d447a5f20d87fa309f00986cb288",
"type": "github"
},
"original": {
@ -199,11 +199,11 @@
},
"nixpkgs-unpatched": {
"locked": {
"lastModified": 1713964117,
"narHash": "sha256-OjGULV89fbmD+kSD83ZjSG1sT6rFwI1/Ijjg+amRBys=",
"lastModified": 1714163391,
"narHash": "sha256-cNFOXSGBex7iuwVvTvLAOyaLJ2JrbpkazhN5sFsBd+E=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "1eb9a6980dee3970850f47ba8139c7402f54a9a0",
"rev": "0b868df4ced96400774414f5baf30b696215b98f",
"type": "github"
},
"original": {
@ -223,11 +223,11 @@
]
},
"locked": {
"lastModified": 1713950167,
"narHash": "sha256-D/Vp8UJDA7t3X/wIHuZosHBTjuWBabeqr6roa2jwnfI=",
"lastModified": 1714148467,
"narHash": "sha256-490twO3T4EYoQcQ0FuJjnwIdt8eRryNzIq3CVDnRzFw=",
"owner": "nix-community",
"repo": "nixpkgs-wayland",
"rev": "80659e4b2805654de851996e682b063a5d7eea5e",
"rev": "ca9d278400c170935a95dd75e7e2537c2afd1cb7",
"type": "github"
},
"original": {

2
hosts/modules/gui/default.nix
View File

@ -98,7 +98,7 @@ in
# "picard" # music tagging
# "libsForQt5.plasmatube" # Youtube player
"signal-desktop"
"spot" # Gnome Spotfy client
"spot" # Gnome Spotify client
# "sublime-music"
# "tdesktop" # broken on phosh
# "tokodon"

11
overlays/cross.nix
View File

@ -1862,10 +1862,15 @@ in with final; {
let
rustTargetPlatform = rust.toRustTarget stdenv.hostPlatform;
in {
# blueprint-compiler runs on the build machine, but tries to load gobject-introspection types meant for the host.
postPatch = (upstream.postPatch or "") + ''
substituteInPlace build-aux/cargo.sh --replace \
'OUTPUT_BIN="$CARGO_TARGET_DIR"' \
'OUTPUT_BIN="$CARGO_TARGET_DIR/${rustTargetPlatform}"'
substituteInPlace src/meson.build \
--replace-fail \
"find_program('blueprint-compiler')" \
"'env', 'GI_TYPELIB_PATH=${buildPackages.gdk-pixbuf.out}/lib/girepository-1.0:${buildPackages.harfbuzz.out}/lib/girepository-1.0:${buildPackages.gtk4.out}/lib/girepository-1.0:${buildPackages.graphene}/lib/girepository-1.0:${buildPackages.libadwaita}/lib/girepository-1.0:${buildPackages.pango.out}/lib/girepository-1.0', find_program('blueprint-compiler')" \
--replace-fail \
"meson.project_build_root() / cargo_output" \
"meson.project_build_root() / 'src' / '${rust.envVars.rustHostPlatformSpec}' / rust_target / meson.project_name()"
'';
# nixpkgs sets CARGO_BUILD_TARGET to the build platform target, so correct that.
buildPhase = ''