From 6258728318fe55faef64285e614fe97edc7b9111 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 21 Mar 2015 13:36:00 +0000 Subject: [PATCH 1/3] pythonPackages: notmuch: fix sourceRoot so that one can use overrides in top-level notmuch and still have this work --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c01b3b59ee0f..bdc3be08bc8d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6885,7 +6885,7 @@ let src = pkgs.notmuch.src; - sourceRoot = "${pkgs.notmuch.name}/bindings/python"; + sourceRoot = "${pkgs.notmuch.src.name}/bindings/python"; buildInputs = with self; [ python pkgs.notmuch ]; From 3e15f6a3700968904c4a30c5a90c46d766856bbf Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 21 Mar 2015 12:35:51 +0000 Subject: [PATCH 2/3] xscreensaver: change patchPhase into preConfigure so that one can use patches, fix a comment --- pkgs/misc/screensavers/xscreensaver/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index cb937a940006..1d039e0a4402 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -18,14 +18,15 @@ stdenv.mkDerivation rec { libXxf86misc intltool ]; - patchPhase = + preConfigure = '' # Fix build error in version 5.18. Remove this patch when updating # to a later version. #sed -i -e '/AF_LINK/d' hacks/glx/sonar-icmp.c - # Fix path to GTK. + + # Fix installation paths for GTK resources. sed -e 's%@GTK_DATADIR@%@datadir@% ; s%@PO_DATADIR@%@datadir@%' \ - -i driver/Makefile.in po/Makefile.in.in + -i driver/Makefile.in po/Makefile.in.in ''; configureFlags = From 94df35da1fdfd9ded4c902e7be595df674fb1b72 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Tue, 24 Mar 2015 22:54:31 +0000 Subject: [PATCH 3/3] emacs: ghc-mod: add the binary to user environment This is the correct way to do it, because users will expect to see the same ghc-mod both in emacs and in shell. --- pkgs/top-level/emacs-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index a5a087e16add..4b23992d12a1 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -454,6 +454,7 @@ let self = _self // overrides; pname = "ghc"; version = external.ghc-mod.version; src = external.ghc-mod.src; + propagatedUserEnvPkgs = [ external.ghc-mod ]; fileSpecs = [ "elisp/*.el" ]; meta = { license = bsd3; }; };