diff --git a/pkgs/by-name/de/delineate/graphview-dir.patch b/pkgs/by-name/de/delineate/graphview-dir.patch deleted file mode 100644 index 3a6eaa774290..000000000000 --- a/pkgs/by-name/de/delineate/graphview-dir.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/meson.build b/meson.build -index 616ccff..d32b4c5 100644 ---- a/meson.build -+++ b/meson.build -@@ -29,7 +29,7 @@ version = meson.project_version() - prefix = get_option('prefix') - bindir = prefix / get_option('bindir') - localedir = prefix / get_option('localedir') --graphviewsrcdir = prefix / 'src/delineate/graph_view' -+graphviewsrcdir = prefix / 'opt/delineate/graph_view' - - datadir = prefix / get_option('datadir') - pkgdatadir = datadir / meson.project_name() diff --git a/pkgs/by-name/de/delineate/package.nix b/pkgs/by-name/de/delineate/package.nix index 9d1d86d63b7f..25144bfc366f 100644 --- a/pkgs/by-name/de/delineate/package.nix +++ b/pkgs/by-name/de/delineate/package.nix @@ -2,7 +2,6 @@ appstream, buildNpmPackage, cargo, - cmake, desktop-file-utils, fetchFromGitHub, gtk4, @@ -40,27 +39,29 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "delineate"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "SeaDve"; repo = "Delineate"; tag = "v${finalAttrs.version}"; - hash = "sha256-dFGh7clxc6UxQRTsNKrggWDvL3CPmzJmrvO1jqMVoTg="; + hash = "sha256-rYA5TKHX3QJHcUhaTFDpcXQ6tdaG3MbX8buvzV0V5iY="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-RtQnpbjULtnvlc71L4KIKPES0WRSY2GoaIwt8UvlYOA="; + hash = "sha256-6XBg9kbIr5k+TMQ/TE/qsAA5rKIevU9M1m+jsPrqfYw="; }; - patches = [ - ./graphview-dir.patch - ]; + # rename $out/src -> $out/opt + postPatch = '' + substituteInPlace ./meson.build --replace-fail \ + "graphviewsrcdir = prefix / 'src/delineate/graph_view'" \ + "graphviewsrcdir = prefix / 'opt/delineate/graph_view'" + ''; nativeBuildInputs = [ cargo - cmake desktop-file-utils gtk4 meson @@ -79,8 +80,6 @@ stdenv.mkDerivation (finalAttrs: { webkitgtk_6_0 ]; - dontUseCmakeConfigure = true; - postInstall = '' ln -s ${d3-graphviz}/lib/node_modules/d3-graphviz $out/opt/delineate/graph_view/d3-graphviz '';