summary refs log tree commit diff
diff options
context:
space:
mode:
authorgrindhold <grindhold@gmx.net>2022-09-30 14:13:14 +0200
committergrindhold <grindhold@gmx.net>2022-10-08 21:16:54 +0200
commitd64475464c1922e3420f70f1defc5823f5d13b46 (patch)
treedc2d0c4e202bd93924d290a8d0b66f9dc43836c9
parent7999ad87aecdc30efae9ffac6f221dacef6b231c (diff)
downloadnixpkgs-d64475464c1922e3420f70f1defc5823f5d13b46.tar
nixpkgs-d64475464c1922e3420f70f1defc5823f5d13b46.tar.gz
nixpkgs-d64475464c1922e3420f70f1defc5823f5d13b46.tar.bz2
nixpkgs-d64475464c1922e3420f70f1defc5823f5d13b46.tar.lz
nixpkgs-d64475464c1922e3420f70f1defc5823f5d13b46.tar.xz
nixpkgs-d64475464c1922e3420f70f1defc5823f5d13b46.tar.zst
nixpkgs-d64475464c1922e3420f70f1defc5823f5d13b46.zip
libgtkflow: split into 3 separate derivations
-rw-r--r--pkgs/development/libraries/libgflow/default.nix (renamed from pkgs/development/libraries/libgtkflow/default.nix)20
-rw-r--r--pkgs/development/libraries/libgtkflow3/default.nix54
-rw-r--r--pkgs/development/libraries/libgtkflow4/default.nix54
-rw-r--r--pkgs/top-level/all-packages.nix4
4 files changed, 126 insertions, 6 deletions
diff --git a/pkgs/development/libraries/libgtkflow/default.nix b/pkgs/development/libraries/libgflow/default.nix
index 78e43d56b9a..007afa6ef5b 100644
--- a/pkgs/development/libraries/libgtkflow/default.nix
+++ b/pkgs/development/libraries/libgflow/default.nix
@@ -1,15 +1,18 @@
 {stdenv, lib, vala, meson, ninja, pkg-config, fetchFromGitea, gobject-introspection, glib, gtk3}:
 
 stdenv.mkDerivation rec {
-  pname = "libgtkflow";
-  version = "0.10.0";
+  pname = "libgflow";
+  version = "1.0.4";
+
+  outputs = [ "out" "dev" "devdoc" ];
+  outputBin = "devdoc"; # demo app
 
   src = fetchFromGitea {
     domain = "notabug.org";
     owner = "grindhold";
-    repo = pname;
-    rev = version;
-    hash = "sha256-iTOoga94yjGTowQOM/EvHEDOO9Z3UutPGRgEoI1UWkI=";
+    repo = "libgtkflow";
+    rev = "gflow_${version}";
+    hash = "sha256-JoVq7U5JQ3pRxptR7igWFw7lcBTsgr3aVXxayLqhyFo=";
   };
 
   nativeBuildInputs = [
@@ -25,8 +28,15 @@ stdenv.mkDerivation rec {
     glib
   ];
 
+  postFixup = ''
+    # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
+    moveToOutput "share/doc" "$devdoc"
+  '';
+
   mesonFlags = [
     "-Denable_valadoc=true"
+    "-Denable_gtk3=false"
+    "-Denable_gtk4=false"
   ];
 
   meta = with lib; {
diff --git a/pkgs/development/libraries/libgtkflow3/default.nix b/pkgs/development/libraries/libgtkflow3/default.nix
new file mode 100644
index 00000000000..7c85bd00b5d
--- /dev/null
+++ b/pkgs/development/libraries/libgtkflow3/default.nix
@@ -0,0 +1,54 @@
+{stdenv, lib, vala, meson, ninja, pkg-config, fetchFromGitea, gobject-introspection, glib, gtk3, libgflow}:
+
+stdenv.mkDerivation rec {
+  pname = "libgtkflow3";
+  version = "1.0.6";
+
+  outputs = [ "out" "dev" "devdoc" ];
+  outputBin = "devdoc"; # demo app
+
+  src = fetchFromGitea {
+    domain = "notabug.org";
+    owner = "grindhold";
+    repo = "libgtkflow";
+    rev = "gtkflow3_${version}";
+    hash = "sha256-JoVq7U5JQ3pRxptR7igWFw7lcBTsgr3aVXxayLqhyFo=";
+  };
+
+  nativeBuildInputs = [
+    vala
+    meson
+    ninja
+    pkg-config
+    gobject-introspection
+  ];
+
+  buildInputs = [
+    gtk3
+    glib
+    libgflow
+  ];
+
+  postFixup = ''
+    # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
+    moveToOutput "share/doc" "$devdoc"
+  '';
+
+  mesonFlags = [
+    "-Denable_valadoc=true"
+    "-Denable_gtk4=false"
+    "-Denable_gflow=false"
+  ];
+
+  postPatch = ''
+    rm -r libgflow
+  '';
+
+  meta = with lib; {
+    description = "Flow graph widget for GTK 3";
+    homepage = "https://notabug.org/grindhold/libgtkflow";
+    maintainers = with maintainers; [ grindhold ];
+    license = licenses.lgpl3Plus;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/development/libraries/libgtkflow4/default.nix b/pkgs/development/libraries/libgtkflow4/default.nix
new file mode 100644
index 00000000000..60439e7636e
--- /dev/null
+++ b/pkgs/development/libraries/libgtkflow4/default.nix
@@ -0,0 +1,54 @@
+{stdenv, lib, vala, meson, ninja, pkg-config, fetchFromGitea, gobject-introspection, glib, gtk4, libgflow}:
+
+stdenv.mkDerivation rec {
+  pname = "libgtkflow4";
+  version = "0.2.6";
+
+  outputs = [ "out" "dev" "devdoc" ];
+  outputBin = "devdoc"; # demo app
+
+  src = fetchFromGitea {
+    domain = "notabug.org";
+    owner = "grindhold";
+    repo = "libgtkflow";
+    rev = "gtkflow4_${version}";
+    hash = "sha256-JoVq7U5JQ3pRxptR7igWFw7lcBTsgr3aVXxayLqhyFo=";
+  };
+
+  nativeBuildInputs = [
+    vala
+    meson
+    ninja
+    pkg-config
+    gobject-introspection
+  ];
+
+  buildInputs = [
+    gtk4
+    glib
+    libgflow
+  ];
+
+  postFixup = ''
+    # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
+    moveToOutput "share/doc" "$devdoc"
+  '';
+
+  mesonFlags = [
+    "-Denable_valadoc=true"
+    "-Denable_gtk3=false"
+    "-Denable_gflow=false"
+  ];
+
+  postPatch = ''
+    rm -r libgflow
+  '';
+
+  meta = with lib; {
+    description = "Flow graph widget for GTK 3";
+    homepage = "https://notabug.org/grindhold/libgtkflow";
+    maintainers = with maintainers; [ grindhold ];
+    license = licenses.lgpl3Plus;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 295e50ee13f..4a84ebc4aa3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -899,7 +899,9 @@ with pkgs;
   ld-is-cc-hook = makeSetupHook { name = "ld-is-cc-hook"; }
     ../build-support/setup-hooks/ld-is-cc-hook.sh;
 
-  libgtkflow = callPackage ../development/libraries/libgtkflow { };
+  libgflow = callPackage ../development/libraries/libgflow { };
+  libgtkflow3 = callPackage ../development/libraries/libgtkflow3 { };
+  libgtkflow4 = callPackage ../development/libraries/libgtkflow4 { };
 
   libredirect = callPackage ../build-support/libredirect { };