diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/editors/emacs-modes/structured-haskell-mode/default.nix | 11 | ||||
-rw-r--r-- | pkgs/applications/misc/kdeconnect/default.nix | 10 |
2 files changed, 11 insertions, 10 deletions
diff --git a/pkgs/applications/editors/emacs-modes/structured-haskell-mode/default.nix b/pkgs/applications/editors/emacs-modes/structured-haskell-mode/default.nix index a832c7d5942c..a9c2478d451c 100644 --- a/pkgs/applications/editors/emacs-modes/structured-haskell-mode/default.nix +++ b/pkgs/applications/editors/emacs-modes/structured-haskell-mode/default.nix @@ -1,15 +1,16 @@ -{ cabal, emacs, haskellSrcExts }: +{ cabal, emacs, haskellMode, haskellSrcExts }: cabal.mkDerivation (self: { pname = "structured-haskell-mode"; - version = "1.0.2"; - sha256 = "1lwdhlr38y5hdr78nplplr3q0hrjhryw378f1857qh0lvp03gwl2"; + version = "1.0.3"; + sha256 = "0axmw8bj51q8v0wd4jp6giw9dnv0mp7kp8yd16s4nm4hcqgrh5h2"; isLibrary = false; isExecutable = true; - buildDepends = [ haskellSrcExts ]; + buildDepends = [ haskellSrcExts haskellMode ]; buildTools = [ emacs ]; postInstall = '' - emacs -L elisp --batch -f batch-byte-compile "elisp/"*.el + emacs -L elisp -L ${haskellMode}/share/emacs/site-lisp \ + --batch -f batch-byte-compile "elisp/"*.el install -d $out/share/emacs/site-lisp install "elisp/"*.el "elisp/"*.elc $out/share/emacs/site-lisp ''; diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix index 70f3855c3d66..f0a66d421011 100644 --- a/pkgs/applications/misc/kdeconnect/default.nix +++ b/pkgs/applications/misc/kdeconnect/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, gettext, kdelibs, makeWrapper, qca2, qca2_ossl, qjson }: +{ stdenv, fetchurl, gettext, kdelibs, libXtst, makeWrapper, qca2, qca2_ossl, qjson }: stdenv.mkDerivation rec { name = "kdeconnect-${version}"; - version = "0.5.2.1"; + version = "0.7"; src = fetchurl { - url = "http://download.kde.org/unstable/kdeconnect/0.5.2/src/kdeconnect-kde-${version}.tar.xz"; - sha256 = "0g632ha7xcqf839c4h0dz5637bz6gnn2gz76dc0qq09zbrq49i08"; + url = "http://download.kde.org/unstable/kdeconnect/${version}/src/kdeconnect-kde-${version}.tar.xz"; + sha256 = "0a8g3avg9x5j07cf3c16i4w65q3fn1cbs8zxgq0vl14rzdy09q2j"; }; - buildInputs = [ gettext kdelibs makeWrapper qca2 qca2_ossl qjson ]; + buildInputs = [ gettext kdelibs libXtst makeWrapper qca2 qca2_ossl qjson ]; postInstall = '' wrapProgram $out/lib/kde4/libexec/kdeconnectd --prefix QT_PLUGIN_PATH : ${qca2_ossl}/lib/qt4/plugins |