mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 07:23:20 +00:00
dia: unstable-2022-12-14 -> unstable-2023-09-28
This commit is contained in:
parent
3e9edb76cf
commit
7ae94d93b0
@ -2,12 +2,11 @@
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, appstream-glib
|
||||
, cmake
|
||||
, dblatex
|
||||
, desktop-file-utils
|
||||
, graphene
|
||||
, gtk2
|
||||
, gtk-mac-integration-gtk2
|
||||
, gtk3
|
||||
, gtk-mac-integration-gtk3
|
||||
, intltool
|
||||
, libxml2
|
||||
, libxslt
|
||||
@ -16,24 +15,22 @@
|
||||
, pkg-config
|
||||
, poppler
|
||||
, python3
|
||||
# Building with docs are failing in unstable-2022-12-14
|
||||
# Building with docs are still failing in unstable-2023-09-28
|
||||
, withDocs ? false
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "dia";
|
||||
version = "unstable-2022-12-14";
|
||||
version = "unstable-2023-09-28";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "GNOME";
|
||||
repo = "dia";
|
||||
domain = "gitlab.gnome.org";
|
||||
rev = "4a619ec7cc93be5ddfbcc48d9e1572d04943bcad";
|
||||
hash = "sha256-xi45Ak4rlDQjs/FNkdkm145mx76GNHjE6Nrs1dc94ww=";
|
||||
rev = "bd551bb2558dcc89bc0bf7b4dd85b38cd85ad322";
|
||||
hash = "sha256-U+8TUE1ULt6MNxnvw9kFjCAVBecUy2Sarof6H9+kR7Q=";
|
||||
};
|
||||
|
||||
patches = [ ./poppler-22_09-build-fix.patch ];
|
||||
|
||||
# Required for the PDF plugin when building with clang.
|
||||
CXXFLAGS = "-std=c++17";
|
||||
|
||||
@ -43,7 +40,7 @@ stdenv.mkDerivation {
|
||||
|
||||
buildInputs = [
|
||||
graphene
|
||||
gtk2
|
||||
gtk3
|
||||
libxml2
|
||||
python3
|
||||
poppler
|
||||
@ -52,7 +49,7 @@ stdenv.mkDerivation {
|
||||
libxslt
|
||||
] ++
|
||||
lib.optionals stdenv.isDarwin [
|
||||
gtk-mac-integration-gtk2
|
||||
gtk-mac-integration-gtk3
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
Loading…
Reference in New Issue
Block a user