gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #225892 from bobby285271/fix/webkitgtk-failure

Browse Source 
webkitgtk* reverse dep fix
This commit is contained in:
Bobby Rong
2023-04-12 22:23:49 +08:00
committed by GitHub
parent d550ee0d43 029a32f463
commit c24a512fc0
3 changed files with 995 additions and 669 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/networking/feedreaders/newsflash/Cargo.lock
Generated
+981 -664
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/networking/feedreaders/newsflash/default.nix
+6 -5
View File
@@ -22,20 +22,21 @@
stdenv.mkDerivation (finalAttrs: {
pname = "newsflash";
version = "2.2.4";
version = "unstable-2023-04-11";
src = fetchFromGitLab {
owner = "news-flash";
repo = "news_flash_gtk";
rev = "refs/tags/v.${finalAttrs.version}";
sha256 = "sha256-civHj8a5LYV3XaAjSJBdn15+8sdO/yLlWBXCNW56plA=";
rev = "a7bc8bfdf5e58bd78f0f36516e00be8e1296bc12";
sha256 = "sha256-VYIHbOcYopzGTVG+fGyPBS5di7aBayhk+jj9FZh5Tms=";
};
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
"news-flash-2.2.2" = "sha256-LN5VhJk+NGTR0fohI0LmfeLDS9IkfVE7IFIzmSPF4u0=";
"newsblur_api-0.2.0" = "sha256-+3AobEX+RtBRgX1TIr4rRX0ngJvNVp1oXzkbhppi73M=";
"javascriptcore6-0.1.0" = "sha256-7w8CDY13dCRlFc77XxJ2/xZqlKSjqM0eiOvILOrJ4ic=";
"news-flash-2.2.2" = "sha256-LXKhVsmkdTk1MSB0T5MDOgTJF/MXbNZ6T5cC2iZxsPs=";
"newsblur_api-0.2.0" = "sha256-6vnFeJbdFeIau2rpUk9o72DD2ZCqicljmQjFVhY71NI=";
};
};
pkgs/development/libraries/webkit2-sharp/default.nix
+8
View File
@@ -33,6 +33,14 @@ stdenv.mkDerivation rec {
webkitgtk
];
postPatch = ''
# Workaround build failure with WebKitGTK 2.40.0
# https://github.com/hbons/webkit2-sharp/issues/6
substituteInPlace sources/webkit2-sharp-api.raw --replace \
'<field cname="parentInstance" access="public" writeable="false" readable="true" name="ParentInstance" type="GtkContainer*"/>' \
'<field cname="parent" access="public" writeable="false" readable="true" name="Parent" type="GtkContainer*"/>'
'';
ac_cv_path_MONODOCER = "no";
installFlagsArray = ["GAPIXMLDIR=/tmp/gapixml"];