diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-11-21 16:12:21 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-11-21 16:12:48 +0100 |
| commit | 048a4cd441a59cbf89defb18bb45c9f0b4429b35 (patch) | |
| tree | f8f5850ff05521ab82d65745894714a8796cbfb6 /pkgs/applications/graphics/dia/default.nix | |
| parent | 030c5028b07afcedce7c5956015c629486cc79d9 (diff) | |
| parent | 4c2d05dd6435d449a3651a6dd314d9411b5f8146 (diff) | |
| download | nixpkgs-048a4cd441a59cbf89defb18bb45c9f0b4429b35.tar nixpkgs-048a4cd441a59cbf89defb18bb45c9f0b4429b35.tar.gz nixpkgs-048a4cd441a59cbf89defb18bb45c9f0b4429b35.tar.bz2 nixpkgs-048a4cd441a59cbf89defb18bb45c9f0b4429b35.tar.lz nixpkgs-048a4cd441a59cbf89defb18bb45c9f0b4429b35.tar.xz nixpkgs-048a4cd441a59cbf89defb18bb45c9f0b4429b35.tar.zst nixpkgs-048a4cd441a59cbf89defb18bb45c9f0b4429b35.zip | |
Signed-off-by: Alyssa Ross <hi@alyssa.is>
Diffstat (limited to 'pkgs/applications/graphics/dia/default.nix')
| -rw-r--r-- | pkgs/applications/graphics/dia/default.nix | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index 0adc585603e..eb9d54d5cfc 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -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,23 @@ , pkg-config , poppler , python3 - # Building with docs are failing in unstable-2022-12-14 +, wrapGAppsHook + # 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 +41,7 @@ stdenv.mkDerivation { buildInputs = [ graphene - gtk2 + gtk3 libxml2 python3 poppler @@ -52,7 +50,7 @@ stdenv.mkDerivation { libxslt ] ++ lib.optionals stdenv.isDarwin [ - gtk-mac-integration-gtk2 + gtk-mac-integration-gtk3 ]; nativeBuildInputs = [ @@ -62,6 +60,7 @@ stdenv.mkDerivation { meson ninja pkg-config + wrapGAppsHook ] ++ lib.optionals withDocs [ dblatex |