nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-02 07:31:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

xneur: build with enchant2

Browse Source 
We are trying to remove enchant1 from Nixpkgs. Since there is no
new release we pull the patch from debian to build this with enchant2.
This commit is contained in:
Bobby Rong 2023-01-18 19:08:33 +08:00
parent 564c0bebde
commit ed0995f446
No known key found for this signature in database
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/misc/xneur/default.nix
View File

@ -2,6 +2,7 @@
, lib
, fetchurl
, fetchpatch
, autoreconfHook
, intltool
, pkg-config
, wrapGAppsHook
@ -25,6 +26,7 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [
autoreconfHook
intltool
pkg-config
wrapGAppsHook
@ -52,10 +54,15 @@ stdenv.mkDerivation {
url = "https://salsa.debian.org/debian/xneur/-/raw/da38ad9c8e1bf4e349f5ed4ad909f810fdea44c9/debian/patches/gcc-10.patch";
sha256 = "0pc17a4sdrnrc4z7gz28889b9ywqsm5mzm6m41h67j2f5zh9k3fy";
})
(fetchpatch {
name = "enchant2.patch";
url = "https://salsa.debian.org/debian/xneur/-/raw/695b0fea56cde4ff6cf0f3988218c5cb9d7ff5ae/debian/patches/enchant2.patch";
sha256 = "02a3kkfzdvs5f8dfm6j5x3jcn5j8qah9ykfymp6ffqsf4fijp65n";
})
];
postPatch = ''
sed -e 's@for xosd_dir in@for xosd_dir in ${xosd} @' -i configure
sed -e 's@for xosd_dir in@for xosd_dir in ${xosd} @' -i configure.ac
'';
meta = with lib; {

4
pkgs/top-level/all-packages.nix
View File

@ -33710,9 +33710,7 @@ with pkgs;
xmind = callPackage ../applications/misc/xmind { };
xneur = callPackage ../applications/misc/xneur {
enchant = enchant1;
};
xneur = callPackage ../applications/misc/xneur { };
gxneur = callPackage ../applications/misc/gxneur {
inherit (gnome2) libglade GConf;