nixpkgs: 2024-04-28 -> 2024-05-08; nixpkgs-wayland, sops-nix
``` • Updated input 'nixpkgs-next-unpatched': 'github:nixos/nixpkgs/0e395f4da1693e39239ffac7abf73a0a6931c961' (2024-04-28) → 'github:nixos/nixpkgs/c8e3f684443d7c2875ff169f6ef2533534105e7b' (2024-05-08) • Updated input 'nixpkgs-unpatched': 'github:nixos/nixpkgs/93909e9c7b05634ad924ff97c259ae0859b81756' (2024-04-28) → 'github:nixos/nixpkgs/a751e2faa2fc94c1337c32aaf6a6e417afe90be9' (2024-05-08) • Updated input 'nixpkgs-wayland': 'github:nix-community/nixpkgs-wayland/4e58e2cf22d11426ed2f997551f3650de0639e3a' (2024-04-28) → 'github:nix-community/nixpkgs-wayland/7dc8fb2aa7db995ac1ce2a8f2f8d8784b2af591c' (2024-05-08) • Updated input 'nixpkgs-wayland/lib-aggregate': 'github:nix-community/lib-aggregate/49d9b510614b9bd137e067eb31445a8feca83313' (2024-04-28) → 'github:nix-community/lib-aggregate/26fabca301e1133abd3d9192b1bcb6fb45b30f1d' (2024-05-05) • Updated input 'nixpkgs-wayland/lib-aggregate/nixpkgs-lib': 'github:nix-community/nixpkgs.lib/ade4fb7bbf04cd52bc1705734d5dc67755d77ec9' (2024-04-28) → 'github:nix-community/nixpkgs.lib/4b620020fd73bdd5104e32c702e65b60b6869426' (2024-05-05) • Updated input 'sops-nix': 'github:Mic92/sops-nix/f1b0adc27265274e3b0c9b872a8f476a098679bd' (2024-04-23) → 'github:Mic92/sops-nix/893e3df091f6838f4f9d71c61ab079d5c5dedbd1' (2024-05-06) • Updated input 'sops-nix/nixpkgs-stable': 'github:NixOS/nixpkgs/74574c38577914733b4f7a775dd77d24245081dd' (2024-04-20) → 'github:NixOS/nixpkgs/b980b91038fc4b09067ef97bbe5ad07eecca1e76' (2024-05-04) ```
This commit is contained in:
parent
a056ca84be
commit
2a8ecf0423
42
flake.lock
42
flake.lock
|
@ -61,11 +61,11 @@
|
||||||
"nixpkgs-lib": "nixpkgs-lib"
|
"nixpkgs-lib": "nixpkgs-lib"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1714306226,
|
"lastModified": 1714910950,
|
||||||
"narHash": "sha256-CA7bfnDt9TcFc7I8eKHf72DodYUEETDPgmBFXBRP9/E=",
|
"narHash": "sha256-gaq5bphSsY+htEXFDkImOrH3MVCkxFTvCiwdCJj096E=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "lib-aggregate",
|
"repo": "lib-aggregate",
|
||||||
"rev": "49d9b510614b9bd137e067eb31445a8feca83313",
|
"rev": "26fabca301e1133abd3d9192b1bcb6fb45b30f1d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -152,11 +152,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-lib": {
|
"nixpkgs-lib": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1714265296,
|
"lastModified": 1714870069,
|
||||||
"narHash": "sha256-jVnKiCOoFulPT1zDdA4jfG/lnEnngdth5CT6rVDXEJ4=",
|
"narHash": "sha256-CNCqCGOHdxuiVnVkhTpp2WcqSSmSfeQjubhDOcgwGjU=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixpkgs.lib",
|
"repo": "nixpkgs.lib",
|
||||||
"rev": "ade4fb7bbf04cd52bc1705734d5dc67755d77ec9",
|
"rev": "4b620020fd73bdd5104e32c702e65b60b6869426",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -167,11 +167,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-next-unpatched": {
|
"nixpkgs-next-unpatched": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1714284059,
|
"lastModified": 1715148084,
|
||||||
"narHash": "sha256-j+pzNbMlfK1rPHpgsMxeoKWhYQijBRSKazM2WJv1048=",
|
"narHash": "sha256-arUW5NSCMy7K8uO+1ODJqyptf71HP69XbJlSuf361rI=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "0e395f4da1693e39239ffac7abf73a0a6931c961",
|
"rev": "c8e3f684443d7c2875ff169f6ef2533534105e7b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -183,11 +183,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1713638189,
|
"lastModified": 1714858427,
|
||||||
"narHash": "sha256-q7APLfB6FmmSMI1Su5ihW9IwntBsk2hWNXh8XtSdSIk=",
|
"narHash": "sha256-tCxeDP4C1pWe2rYY3IIhdA40Ujz32Ufd4tcrHPSKx2M=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "74574c38577914733b4f7a775dd77d24245081dd",
|
"rev": "b980b91038fc4b09067ef97bbe5ad07eecca1e76",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -199,11 +199,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-unpatched": {
|
"nixpkgs-unpatched": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1714316994,
|
"lastModified": 1715156971,
|
||||||
"narHash": "sha256-R1pZrEs0d6Ppdf7HWWXACUJRszvHeeJ4aAmS06jQz4k=",
|
"narHash": "sha256-sEgAH6EkkQf5Aux4JT5HvdKWia0ryePYI0RhioskVS8=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "93909e9c7b05634ad924ff97c259ae0859b81756",
|
"rev": "a751e2faa2fc94c1337c32aaf6a6e417afe90be9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -223,11 +223,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1714314982,
|
"lastModified": 1715156333,
|
||||||
"narHash": "sha256-xgDMwBI+2b6XuJJdv2z/kNAURB+dkIpvTosjnS4FSFE=",
|
"narHash": "sha256-8V09AxlIyKh8maX5/fAo8JuijEu9KM1DVlPscxzmKsk=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixpkgs-wayland",
|
"repo": "nixpkgs-wayland",
|
||||||
"rev": "4e58e2cf22d11426ed2f997551f3650de0639e3a",
|
"rev": "7dc8fb2aa7db995ac1ce2a8f2f8d8784b2af591c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -254,11 +254,11 @@
|
||||||
"nixpkgs-stable": "nixpkgs-stable"
|
"nixpkgs-stable": "nixpkgs-stable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1713892811,
|
"lastModified": 1715035358,
|
||||||
"narHash": "sha256-uIGmA2xq41vVFETCF1WW4fFWFT2tqBln+aXnWrvjGRE=",
|
"narHash": "sha256-RY6kqhpCPa/q3vbqt3iYRyjO3hJz9KZnshMjbpPon8o=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "f1b0adc27265274e3b0c9b872a8f476a098679bd",
|
"rev": "893e3df091f6838f4f9d71c61ab079d5c5dedbd1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -59,13 +59,16 @@ in
|
||||||
}).overrideAttrs (upstream: {
|
}).overrideAttrs (upstream: {
|
||||||
# i'm updating experimentally to see if it improves call performance.
|
# i'm updating experimentally to see if it improves call performance.
|
||||||
# i don't *think* this is actually necessary; i don't notice any difference.
|
# i don't *think* this is actually necessary; i don't notice any difference.
|
||||||
version = "0.4.3-unstable-2024-04-01";
|
version = "0.4.3-unstable-2024-04-28";
|
||||||
src = lib.warnIf (lib.versionOlder "0.4.3" upstream.version) "dino update: safe to remove sane patches" pkgs.fetchFromGitHub {
|
src = lib.warnIf (lib.versionOlder "0.4.3" upstream.version) "dino update: safe to remove sane patches" pkgs.fetchFromGitHub {
|
||||||
owner = "dino";
|
owner = "dino";
|
||||||
repo = "dino";
|
repo = "dino";
|
||||||
rev = "d9fa4daa6a7d16f5f0e2183a77ee2d07849dd9f3";
|
rev = "657502955567dd538e56f300e075c7db52e25d74";
|
||||||
hash = "sha256-vJBIMsMLlK8Aw19fD2aFNtegXkjOqEgb3m1hi3fE5DE=";
|
hash = "sha256-SApJy9FgxxLOB5A/zGtpdFZtSqSiS03vggRrCte1tFE=";
|
||||||
};
|
};
|
||||||
|
# avoid double-application of upstreamed patches
|
||||||
|
# https://github.com/NixOS/nixpkgs/pull/309265
|
||||||
|
patches = [];
|
||||||
checkPhase = ''
|
checkPhase = ''
|
||||||
runHook preCheck
|
runHook preCheck
|
||||||
./xmpp-vala-test
|
./xmpp-vala-test
|
||||||
|
|
|
@ -32,12 +32,19 @@ in [
|
||||||
# etc, where "date" is like "20240228181608"
|
# etc, where "date" is like "20240228181608"
|
||||||
# and can be found with `nix-repl > :lf . > lastModifiedDate`
|
# and can be found with `nix-repl > :lf . > lastModifiedDate`
|
||||||
|
|
||||||
|
(fetchpatch' {
|
||||||
|
# TODO: send upstream
|
||||||
|
title = "python3Packages.dbus-python: fix build when doInstallCheck=false";
|
||||||
|
saneCommit = "4d4d0310402b8a7f9273dff448522f01b722a60c";
|
||||||
|
hash = "sha256-3fAobeHbM/IHZzhfAqSKhPy1l28F6MbQBp8rSVX2Lrg=";
|
||||||
|
})
|
||||||
|
|
||||||
# branch: wip-ffado-cross
|
# branch: wip-ffado-cross
|
||||||
(fetchpatch' {
|
(fetchpatch' {
|
||||||
# TODO: send out for review (after jtolnar's stuff is merged)
|
# TODO: send out for review (after jtolnar's stuff is merged)
|
||||||
title = "ffado: support cross compilation";
|
title = "ffado: support cross compilation";
|
||||||
saneCommit = "b0b57ad3c723a74d566f6420dffdb1a7d05304e2";
|
saneCommit = "001fe13a735cb9c6fad80525531e863f949e1495";
|
||||||
hash = "sha256-NwTZJG/+ngzR4IrYOd07KxMybHbYLmDcw4RSIrpbx3U=";
|
hash = "sha256-rVsFR8vRTHqFJgDQFHI/E0LtllqKr79FyR92HPeLUb8=";
|
||||||
})
|
})
|
||||||
|
|
||||||
(fetchpatch' {
|
(fetchpatch' {
|
||||||
|
@ -48,20 +55,6 @@ in [
|
||||||
hash = "sha256-53X4ssdp02C8NOUL5mlbhR7qwE9/KWp6iLmz1ljJopE=";
|
hash = "sha256-53X4ssdp02C8NOUL5mlbhR7qwE9/KWp6iLmz1ljJopE=";
|
||||||
})
|
})
|
||||||
|
|
||||||
(fetchpatch' {
|
|
||||||
title = "sway/hyprland: cross compilation fixes";
|
|
||||||
prUrl = "https://github.com/NixOS/nixpkgs/pull/292415";
|
|
||||||
hash = "sha256-e4yZGMBjL8gSa6cEZ87Txe4+GPhYelyE7IRd4TlV0qc=";
|
|
||||||
})
|
|
||||||
|
|
||||||
(fetchpatch' {
|
|
||||||
title = "gcr: remove build gnupg from runtime closure";
|
|
||||||
prUrl = "https://github.com/NixOS/nixpkgs/pull/263158";
|
|
||||||
saneCommit = "8c71ab22c6df4e5ce290e131a7769688b0c5a017";
|
|
||||||
# hash = "sha256-9PNKzNlJ62WAq6H+tqlt0spFZ1DPP1hHmpx0YPuieFE=";
|
|
||||||
hash = "sha256-6hUdsExHSMHy6FMY1+OLtVmKpRwysGIVkcDpYv7RRBk=";
|
|
||||||
})
|
|
||||||
|
|
||||||
# 2024/02/25: still outstanding; merge conflicts
|
# 2024/02/25: still outstanding; merge conflicts
|
||||||
# (fetchpatch' {
|
# (fetchpatch' {
|
||||||
# title = "hspell: remove build perl from runtime closure";
|
# title = "hspell: remove build perl from runtime closure";
|
||||||
|
@ -149,14 +142,7 @@ in [
|
||||||
hash = "sha256-RUw88u7CI2C1IpRUhGbdYamHsPT1jBV0ROyVvzLWdv8=";
|
hash = "sha256-RUw88u7CI2C1IpRUhGbdYamHsPT1jBV0ROyVvzLWdv8=";
|
||||||
})
|
})
|
||||||
(fetchpatch' {
|
(fetchpatch' {
|
||||||
title = "libgnt: 2.14.1 -> 2.14.3";
|
# TODO: send for review (it should be unblocked as of 2024/05/08)
|
||||||
prUrl = "https://github.com/NixOS/nixpkgs/pull/246937";
|
|
||||||
saneCommit = "ecd423195d72036a209912868ad02742cb4b6fcd";
|
|
||||||
# hash = "sha256-u4V/UHNtd2c3+FppuJ5LeLNSV8ZaLe8cqj8HmcW2a/0=";
|
|
||||||
hash = "sha256-Tymh8r75pcoEzsqkU0wzm+vK137P2pEEilgNIyM8udQ=";
|
|
||||||
})
|
|
||||||
(fetchpatch' {
|
|
||||||
# TODO: send for review once the libgnt patch above is merged
|
|
||||||
title = "pidgin: support cross compilation";
|
title = "pidgin: support cross compilation";
|
||||||
saneCommit = "caacbcc54e217f5ee9281422777a7f712765f71a";
|
saneCommit = "caacbcc54e217f5ee9281422777a7f712765f71a";
|
||||||
hash = "sha256-UyZaNNp84zKShuo6zu0nfZ2FygHGcmV63Ww4Y4CtCF0=";
|
hash = "sha256-UyZaNNp84zKShuo6zu0nfZ2FygHGcmV63Ww4Y4CtCF0=";
|
||||||
|
@ -165,8 +151,7 @@ in [
|
||||||
(fetchpatch' {
|
(fetchpatch' {
|
||||||
title = "libgweather: enable introspection on cross builds";
|
title = "libgweather: enable introspection on cross builds";
|
||||||
prUrl = "https://github.com/NixOS/nixpkgs/pull/251956";
|
prUrl = "https://github.com/NixOS/nixpkgs/pull/251956";
|
||||||
saneCommit = "7a2d0a90cc558ea71dfc78356e61b0675b995634";
|
hash = "sha256-IW+0u5lytIPU3xhgGtYgexXUrS2VFXAV6GC50jJS5ak=";
|
||||||
hash = "sha256-4x1yJgrgmyqYiF+u3A9BrcbNQPQ270c+/jFBYsJoFfI=";
|
|
||||||
})
|
})
|
||||||
|
|
||||||
# for raspberry pi: allow building u-boot for rpi 4{,00}
|
# for raspberry pi: allow building u-boot for rpi 4{,00}
|
||||||
|
|
|
@ -75,6 +75,9 @@ let
|
||||||
pkg
|
pkg
|
||||||
);
|
);
|
||||||
|
|
||||||
|
typelibPath = pkgs: lib.concatStringsSep ":" (builtins.map (p: "${lib.getLib p}/lib/girepository-1.0") pkgs);
|
||||||
|
|
||||||
|
|
||||||
emulated = mkEmulated final prev;
|
emulated = mkEmulated final prev;
|
||||||
|
|
||||||
linuxMinimal = final.linux.override {
|
linuxMinimal = final.linux.override {
|
||||||
|
@ -499,7 +502,15 @@ in with final; {
|
||||||
postPatch = (upstream.postPatch or "") + ''
|
postPatch = (upstream.postPatch or "") + ''
|
||||||
substituteInPlace data/resources/meson.build --replace \
|
substituteInPlace data/resources/meson.build --replace \
|
||||||
"find_program('blueprint-compiler')" \
|
"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')"
|
"'env', 'GI_TYPELIB_PATH=${typelibPath [
|
||||||
|
buildPackages.gdk-pixbuf
|
||||||
|
buildPackages.glib
|
||||||
|
buildPackages.graphene
|
||||||
|
buildPackages.gtk4
|
||||||
|
buildPackages.harfbuzz
|
||||||
|
buildPackages.libadwaita
|
||||||
|
buildPackages.pango
|
||||||
|
]}', find_program('blueprint-compiler')"
|
||||||
'';
|
'';
|
||||||
# error: "<dialect> is not allowed to refer to the following paths: <build python>"
|
# error: "<dialect> is not allowed to refer to the following paths: <build python>"
|
||||||
# dialect's meson build script sets host binaries to use build PYTHON
|
# dialect's meson build script sets host binaries to use build PYTHON
|
||||||
|
@ -791,10 +802,21 @@ in with final; {
|
||||||
postPatch = (upstream.postPatch or "") + ''
|
postPatch = (upstream.postPatch or "") + ''
|
||||||
substituteInPlace data/meson.build --replace \
|
substituteInPlace data/meson.build --replace \
|
||||||
"find_program('blueprint-compiler')" \
|
"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')"
|
"'env', 'GI_TYPELIB_PATH=${typelibPath [
|
||||||
|
buildPackages.gdk-pixbuf
|
||||||
|
buildPackages.glib
|
||||||
|
buildPackages.graphene
|
||||||
|
buildPackages.gtk4
|
||||||
|
buildPackages.harfbuzz
|
||||||
|
buildPackages.libadwaita
|
||||||
|
buildPackages.pango
|
||||||
|
]}', find_program('blueprint-compiler')"
|
||||||
'';
|
'';
|
||||||
});
|
});
|
||||||
|
|
||||||
|
# 2024/05/08: fix: "meson.build:85:11: ERROR: Dependency "dbus-1" not found, tried pkgconfig".
|
||||||
|
gnome-online-accounts = mvToBuildInputs [ dbus ] prev.gnome-online-accounts;
|
||||||
|
|
||||||
gnome = prev.gnome.overrideScope (self: super: {
|
gnome = prev.gnome.overrideScope (self: super: {
|
||||||
evolution-data-server = super.evolution-data-server.overrideAttrs (upstream: {
|
evolution-data-server = super.evolution-data-server.overrideAttrs (upstream: {
|
||||||
# 2023/12/08: upstreaming is unblocked, but depends on webkitgtk 4.1
|
# 2023/12/08: upstreaming is unblocked, but depends on webkitgtk 4.1
|
||||||
|
@ -1070,7 +1092,15 @@ in with final; {
|
||||||
postPatch = (upstream.postPatch or "") + ''
|
postPatch = (upstream.postPatch or "") + ''
|
||||||
substituteInPlace data/meson.build --replace \
|
substituteInPlace data/meson.build --replace \
|
||||||
"find_program('blueprint-compiler')" \
|
"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')"
|
"'env', 'GI_TYPELIB_PATH=${typelibPath [
|
||||||
|
buildPackages.gdk-pixbuf
|
||||||
|
buildPackages.glib
|
||||||
|
buildPackages.graphene
|
||||||
|
buildPackages.gtk4
|
||||||
|
buildPackages.harfbuzz
|
||||||
|
buildPackages.libadwaita
|
||||||
|
buildPackages.pango
|
||||||
|
]}', find_program('blueprint-compiler')"
|
||||||
'';
|
'';
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -1834,7 +1864,15 @@ in with final; {
|
||||||
substituteInPlace src/meson.build \
|
substituteInPlace src/meson.build \
|
||||||
--replace-fail \
|
--replace-fail \
|
||||||
"find_program('blueprint-compiler')" \
|
"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')" \
|
"'env', 'GI_TYPELIB_PATH=${typelibPath [
|
||||||
|
buildPackages.gdk-pixbuf
|
||||||
|
buildPackages.glib
|
||||||
|
buildPackages.graphene
|
||||||
|
buildPackages.gtk4
|
||||||
|
buildPackages.harfbuzz
|
||||||
|
buildPackages.libadwaita
|
||||||
|
buildPackages.pango
|
||||||
|
]}', find_program('blueprint-compiler')" \
|
||||||
--replace-fail \
|
--replace-fail \
|
||||||
"meson.project_build_root() / cargo_output" \
|
"meson.project_build_root() / cargo_output" \
|
||||||
"meson.project_build_root() / 'src' / '${rust.envVars.rustHostPlatformSpec}' / rust_target / meson.project_name()"
|
"meson.project_build_root() / 'src' / '${rust.envVars.rustHostPlatformSpec}' / rust_target / meson.project_name()"
|
||||||
|
@ -1900,8 +1938,15 @@ in with final; {
|
||||||
postPatch = (upstream.postPatch or "") + ''
|
postPatch = (upstream.postPatch or "") + ''
|
||||||
substituteInPlace src/meson.build \
|
substituteInPlace src/meson.build \
|
||||||
--replace "find_program('gjs').full_path()" "'${gjs}/bin/gjs'" \
|
--replace "find_program('gjs').full_path()" "'${gjs}/bin/gjs'" \
|
||||||
--replace "gjspack," "'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', '${buildPackages.gjs}/bin/gjs', '-m', gjspack,"
|
--replace "gjspack," "'env', 'GI_TYPELIB_PATH=${typelibPath [
|
||||||
|
buildPackages.gdk-pixbuf
|
||||||
|
buildPackages.glib
|
||||||
|
buildPackages.graphene
|
||||||
|
buildPackages.gtk4
|
||||||
|
buildPackages.harfbuzz
|
||||||
|
buildPackages.libadwaita
|
||||||
|
buildPackages.pango
|
||||||
|
]}', '${buildPackages.gjs}/bin/gjs', '-m', gjspack,"
|
||||||
'';
|
'';
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user