ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-11 04:02:55 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #243030 from doronbehar/pkg/ipe

Browse Source 
ipe: 7.2.26 -> 7.2.27
This commit is contained in:
Doron Behar 2023-07-30 11:11:31 +00:00 committed by GitHub
commit 424ed972a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/graphics/ipe/default.nix
View File

@ -17,19 +17,17 @@
, wrapQtAppsHook
, zlib
, withTeXLive ? true
, buildPackages
}:
stdenv.mkDerivation rec {
pname = "ipe";
version = "7.2.26";
version = "7.2.27";
src = fetchurl {
url = "https://github.com/otfried/ipe/releases/download/v${version}/ipe-${version}-src.tar.gz";
sha256 = "sha256-5J0AV5E6SlFrIBfwDZrbJnkDUoVZ0fDH669s2RQ1CqU=";
sha256 = "sha256-wx/bZy8kB7dpZsz58BeRGdS1BzbrIoafgEmLyFg7wZU=";
};
patches = [
./headers-lookup.patch
];
nativeBuildInputs = [ pkg-config copyDesktopItems wrapQtAppsHook ];
@ -52,6 +50,7 @@ stdenv.mkDerivation rec {
"-C src"
"IPEPREFIX=${placeholder "out"}"
"LUA_PACKAGE=lua"
"MOC=${buildPackages.qt6Packages.qtbase}/libexec/moc"
"IPE_NO_SPELLCHECK=1" # qtSpell is not yet packaged
];

13
pkgs/applications/graphics/ipe/headers-lookup.patch
View File

@ -1,13 +0,0 @@
diff --git a/src/ipepresenter/Makefile b/src/ipepresenter/Makefile
index ae3664e..f4f74ff 100644
--- a/src/ipepresenter/Makefile
+++ b/src/ipepresenter/Makefile
@@ -8,7 +8,7 @@ include ../common.mak
TARGET = $(call exe_target,ipepresenter)
-CXXFLAGS += -I../include -I../ipecanvas -I../ipecairo \
+CPPFLAGS += -I../include -I../ipecanvas -I../ipecairo \
$(UI_CFLAGS) $(CAIRO_CFLAGS) $(ZLIB_CFLAGS)
LIBS += -L$(buildlib) -lipecanvas -lipecairo -lipe \
$(UI_LIBS) $(CAIRO_LIBS) $(ZLIB_LIBS)

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

@ -32511,7 +32511,7 @@ with pkgs;
lua = lua5_1;
};
ipe = libsForQt5.callPackage ../applications/graphics/ipe {
ipe = qt6Packages.callPackage ../applications/graphics/ipe {
ghostscript = ghostscriptX;
texlive = texlive.combine { inherit (texlive) scheme-small; };
lua5 = lua5_3;