diff options
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/photoflare/default.nix | 31 | ||||
-rw-r--r-- | pkgs/applications/graphics/yed/default.nix | 15 |
2 files changed, 43 insertions, 3 deletions
diff --git a/pkgs/applications/graphics/photoflare/default.nix b/pkgs/applications/graphics/photoflare/default.nix new file mode 100644 index 0000000000000..43b12c40d965a --- /dev/null +++ b/pkgs/applications/graphics/photoflare/default.nix @@ -0,0 +1,31 @@ +{ mkDerivation, stdenv, graphicsmagick, fetchFromGitHub, qmake, qtbase, qttools +}: + +mkDerivation rec { + pname = "photoflare"; + version = "1.6.5"; + + src = fetchFromGitHub { + owner = "PhotoFlare"; + repo = "photoflare"; + rev = "v${version}"; + sha256 = "0a394324h7ds567z3i3pw6kkii78n4qwdn129kgkkm996yh03q89"; + }; + + nativeBuildInputs = [ qmake qttools ]; + buildInputs = [ qtbase graphicsmagick ]; + + qmakeFlags = [ "PREFIX=${placeholder "out"}" ]; + + NIX_CFLAGS_COMPILE = "-I${graphicsmagick}/include/GraphicsMagick"; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A cross-platform image editor with a powerful features and a very friendly graphical user interface"; + homepage = "https://photoflare.io"; + maintainers = [ maintainers.omgbebebe ]; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index f92e910eacce7..7eb0851834fcd 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, makeWrapper, unzip, jre }: +{ stdenv, fetchzip, makeWrapper, unzip, jre, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "yEd"; @@ -9,16 +9,25 @@ stdenv.mkDerivation rec { sha256 = "0sd73s700f3gqq5zq1psrqjg6ff2gv49f8vd37v6bv65vdxqxryq"; }; - nativeBuildInputs = [ makeWrapper unzip ]; + nativeBuildInputs = [ makeWrapper unzip wrapGAppsHook ]; + # For wrapGAppsHook setup hook + buildInputs = [ jre.gtk3 ]; - installPhase = '' + dontConfigure = true; + dontBuild = true; + dontInstall = true; + + preFixup = '' mkdir -p $out/yed cp -r * $out/yed mkdir -p $out/bin + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") makeWrapper ${jre}/bin/java $out/bin/yed \ + ''${makeWrapperArgs[@]} \ --add-flags "-jar $out/yed/yed.jar --" ''; + dontWrapGApps = true; meta = with stdenv.lib; { license = licenses.unfree; |