From 313b88621be7c30596302db888487f8356123874 Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Tue, 26 Jan 2016 22:10:12 +0100 Subject: synfigstudio: 1.0.1 -> 1.0.2 (close #12308) vcunat cleaned autoreconf-related stuff and indentation. --- .../applications/graphics/synfigstudio/default.nix | 48 ++++++++++++++-------- 1 file changed, 32 insertions(+), 16 deletions(-) (limited to 'pkgs/applications/graphics') diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index 372c11b5bda5..0dd4eab35f1e 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -1,51 +1,67 @@ -{ stdenv, fetchurl, boost, cairo, fontsConf, gettext, glibmm, gtk3, gtkmm3 +{ stdenv, fetchFromGitHub, boost, cairo, fontsConf, gettext, glibmm, gtk3, gtkmm3 , libjack2, libsigcxx, libtool, libxmlxx, makeWrapper, mlt-qt5, pango, pkgconfig -, imagemagick, intltool +, imagemagick, intltool, autoreconfHook, which }: let - version = "1.0.1"; + version = "1.0.2"; ETL = stdenv.mkDerivation rec { name = "ETL-0.04.19"; - src = fetchurl { - url = "http://download.tuxfamily.org/synfig/releases/${version}/${name}.tar.gz"; - sha256 = "1zmqv2fa5zxprza3wbhk5mxjk7491jqshxxai92s7fdiza0nhs91"; + src = fetchFromGitHub { + repo = "synfig"; + owner = "synfig"; + rev = version; + sha256 = "09ldkvzczqvb1yvlibd62y56dkyprxlr0w3rk38rcs7jnrhj2cqc"; }; + + postUnpack = "sourceRoot=\${sourceRoot}/ETL/"; + + buildInputs = [ autoreconfHook ]; }; synfig = stdenv.mkDerivation rec { name = "synfig-${version}"; - src = fetchurl { - url = "http://download.tuxfamily.org/synfig/releases/${version}/${name}.tar.gz"; - sha256 = "0l1f2xwmzds32g46fqwsq7j5qlnfps6944chbv14d3ynzgyyp1i3"; + src = fetchFromGitHub { + repo = "synfig"; + owner = "synfig"; + rev = version; + sha256 = "09ldkvzczqvb1yvlibd62y56dkyprxlr0w3rk38rcs7jnrhj2cqc"; }; + postUnpack = "sourceRoot=\${sourceRoot}/synfig-core/"; + configureFlags = [ "--with-boost=${boost.dev}" "--with-boost-libdir=${boost.lib}/lib" ]; buildInputs = [ - ETL boost cairo gettext glibmm mlt-qt5 libsigcxx libtool libxmlxx pango - pkgconfig + ETL boost cairo gettext glibmm mlt-qt5 libsigcxx libxmlxx pango + pkgconfig autoreconfHook ]; }; in stdenv.mkDerivation rec { name = "synfigstudio-${version}"; - src = fetchurl { - url = "http://download.tuxfamily.org/synfig/releases/${version}/${name}.tar.gz"; - sha256 = "0jfa946rfh0dbagp18zknlj9ffrd4h45xcy2dh2vlhn6jdm08yfi"; + src = fetchFromGitHub { + repo = "synfig"; + owner = "synfig"; + rev = version; + sha256 = "09ldkvzczqvb1yvlibd62y56dkyprxlr0w3rk38rcs7jnrhj2cqc"; }; + postUnpack = "sourceRoot=\${sourceRoot}/synfig-studio/"; + + preConfigure = "./bootstrap.sh"; + buildInputs = [ ETL boost cairo gettext glibmm gtk3 gtkmm3 imagemagick intltool - libjack2 libsigcxx libtool libxmlxx makeWrapper mlt-qt5 pkgconfig - synfig + libjack2 libsigcxx libxmlxx makeWrapper mlt-qt5 pkgconfig + synfig autoreconfHook which ]; postInstall = '' -- cgit 1.4.1 From c5379e7da80bbc5cf003daf2672a27d2b170bbaf Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Sat, 9 Jan 2016 01:24:28 +0100 Subject: pkgs.darktable: 1.6.9 -> 2.0.0 See http://www.darktable.org/2015/12/darktable-2-0-released/ changes by @globin: added wrapGAppsHook and adwaita-icon-theme Signed-off-by: Robin Gloster --- pkgs/applications/graphics/darktable/default.nix | 35 ++++++++---------------- pkgs/development/libraries/pugixml/default.nix | 4 ++- pkgs/top-level/all-packages.nix | 1 + 3 files changed, 16 insertions(+), 24 deletions(-) (limited to 'pkgs/applications/graphics') diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 77bddc89e2fc..ef222d2e816f 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -1,46 +1,35 @@ { stdenv, fetchurl, libsoup, graphicsmagick, SDL, json_glib , GConf, atk, cairo, cmake, curl, dbus_glib, exiv2, glib -, libgnome_keyring, gtk, ilmbase, intltool, lcms, lcms2 +, libgnome_keyring, gtk3, ilmbase, intltool, lcms, lcms2 , lensfun, libXau, libXdmcp, libexif, libglade, libgphoto2, libjpeg -, libpng, libpthreadstubs, libraw1394, librsvg, libtiff, libxcb +, libpng, libpthreadstubs, librsvg, libtiff, libxcb , openexr, pixman, pkgconfig, sqlite, bash, libxslt, openjpeg -, mesa }: +, mesa, lua, pugixml, colord, colord-gtk, libxshmfence, libxkbcommon +, epoxy, at_spi2_core, libwebp, libsecret, wrapGAppsHook, gnome3 +}: assert stdenv ? glibc; stdenv.mkDerivation rec { - version = "1.6.9"; + version = "2.0.0"; name = "darktable-${version}"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "0wri89ygjpv7npiz58mnydhgldywp6arqp9jq3v0g54a56fiwwhg"; + sha256 = "1cbwvzqn3158cy7r499rdwipx7fpb30lrrvh6jy5a4xvpcjzbwnl"; }; buildInputs = - [ GConf atk cairo cmake curl dbus_glib exiv2 glib libgnome_keyring gtk + [ GConf atk cairo cmake curl dbus_glib exiv2 glib libgnome_keyring gtk3 ilmbase intltool lcms lcms2 lensfun libXau libXdmcp libexif - libglade libgphoto2 libjpeg libpng libpthreadstubs libraw1394 + libglade libgphoto2 libjpeg libpng libpthreadstubs librsvg libtiff libxcb openexr pixman pkgconfig sqlite libxslt - libsoup graphicsmagick SDL json_glib openjpeg mesa + libsoup graphicsmagick SDL json_glib openjpeg mesa lua pugixml + colord colord-gtk libxshmfence libxkbcommon epoxy at_spi2_core + libwebp libsecret wrapGAppsHook gnome3.adwaita-icon-theme ]; - preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/include/gtk-2.0" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/lib/gtk-2.0/include" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${cairo}/include/cairo" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${atk}/include/atk-1.0" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${ilmbase}/include/OpenEXR" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${openexr}/include/OpenEXR" - ''; - cmakeFlags = [ - "-DPTHREAD_INCLUDE_DIR=${stdenv.glibc}/include" - "-DPTHREAD_LIBRARY=${stdenv.glibc}/lib/libpthread.so" - "-DCMAKE_BUILD_TYPE=Release" - "-DBINARY_PACKAGE_BUILD=1" - "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include" - "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk}/lib/gtk-2.0/include" "-DBUILD_USERMANUAL=False" ]; diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix index b866a347d95e..6ce2d9e2ffe0 100644 --- a/pkgs/development/libraries/pugixml/default.nix +++ b/pkgs/development/libraries/pugixml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake }: +{ stdenv, fetchurl, cmake, shared ? false }: stdenv.mkDerivation rec { name = "pugixml-${version}"; @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { sourceRoot = "${name}/scripts"; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if shared then "ON" else "OFF"}" ]; + preConfigure = '' # Enable long long support (required for filezilla) sed -ire '/PUGIXML_HAS_LONG_LONG/ s/^\/\///' ../src/pugiconfig.hpp diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 28583006175c..16a90aab7c7b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11525,6 +11525,7 @@ let darktable = callPackage ../applications/graphics/darktable { inherit (gnome) GConf libglade; + pugixml = pugixml.override { shared = true; }; }; das_watchdog = callPackage ../tools/system/das_watchdog { }; -- cgit 1.4.1 From 9a72bf5c0fa8c6d265c3fe0df5f2842b21519cd7 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Fri, 5 Feb 2016 14:49:27 +0100 Subject: udev: sane: fix udev error The new udev checks that no script references any absolute /bin/sh paths, so this patches that out. --- pkgs/applications/graphics/sane/backends/generic.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'pkgs/applications/graphics') diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix index 8f46e647252e..2ee5e1ddcf51 100644 --- a/pkgs/applications/graphics/sane/backends/generic.nix +++ b/pkgs/applications/graphics/sane/backends/generic.nix @@ -50,6 +50,9 @@ stdenv.mkDerivation { mkdir -p $out/etc/udev/rules.d/ ./tools/sane-desc -m udev > $out/etc/udev/rules.d/49-libsane.rules || \ cp tools/udev/libsane.rules $out/etc/udev/rules.d/49-libsane.rules + # the created 49-libsane references /bin/sh + substituteInPlace $out/etc/udev/rules.d/49-libsane.rules \ + -- replace "RUN+=\"/bin/sh" "RUN+=\"${stdenv.shell}" substituteInPlace $out/lib/libsane.la \ --replace "-ljpeg" "-L${libjpeg}/lib -ljpeg" -- cgit 1.4.1 From 71d01db76fa5c4e62417382e27f6a89f0f8a60a0 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 9 Feb 2016 00:13:07 +0100 Subject: sane: *really* fix udev error \#12874 tried to patch out the literal /bin/sh, but an additional space sneaked in. --- pkgs/applications/graphics/sane/backends/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/applications/graphics') diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix index 2ee5e1ddcf51..e457ba29d975 100644 --- a/pkgs/applications/graphics/sane/backends/generic.nix +++ b/pkgs/applications/graphics/sane/backends/generic.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation { cp tools/udev/libsane.rules $out/etc/udev/rules.d/49-libsane.rules # the created 49-libsane references /bin/sh substituteInPlace $out/etc/udev/rules.d/49-libsane.rules \ - -- replace "RUN+=\"/bin/sh" "RUN+=\"${stdenv.shell}" + --replace "RUN+=\"/bin/sh" "RUN+=\"${stdenv.shell}" substituteInPlace $out/lib/libsane.la \ --replace "-ljpeg" "-L${libjpeg}/lib -ljpeg" -- cgit 1.4.1 From 16d6eb45f18fe94885d25a729313a2387765d60f Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 13 Feb 2016 05:13:49 +0100 Subject: imv: 1.2.0 -> 2.0.0 --- pkgs/applications/graphics/imv/default.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'pkgs/applications/graphics') diff --git a/pkgs/applications/graphics/imv/default.nix b/pkgs/applications/graphics/imv/default.nix index 9298c764d286..5be5a8b161db 100644 --- a/pkgs/applications/graphics/imv/default.nix +++ b/pkgs/applications/graphics/imv/default.nix @@ -1,19 +1,16 @@ -{ stdenv, fetchFromGitHub, - SDL2, freeimage -}: +{ stdenv, fetchgit, SDL2, SDL2_ttf, freeimage }: stdenv.mkDerivation rec { name = "imv-${version}"; - version = "1.1.0"; + version = "2.0.0"; - src = fetchFromGitHub { - owner = "eXeC64"; - repo = "imv"; - rev = "4d1a6d581b70b25d9533c5c788aab6900ebf82bb"; - sha256 = "1c5r4pqqypir8ymicxyn2k7mhq8nl88b3x6giaafd77ssjn0vz9r"; + src = fetchgit { + url = "https://github.com/eXeC64/imv.git"; + rev = "bc90a0adcc5b22d2bf0158333eb6dfb34c402d48"; + sha256 = "1bzx57d9mcxw9s72pdbdbwq9pns946jl6p2g881z43w68gimlpw7"; }; - buildInputs = [ SDL2 freeimage ]; + buildInputs = [ SDL2 SDL2_ttf freeimage ]; configurePhase = "substituteInPlace Makefile --replace /usr $out"; -- cgit 1.4.1