diff options
| author | Domen Kožar <domen@dev.si> | 2015-03-27 11:09:16 +0100 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2015-03-27 11:09:16 +0100 |
| commit | 883ee4dd72594f51c5af20d4fe6be09ce83a7e85 (patch) | |
| tree | 86839fe5f119f9713e047598b00f1e688226e50c | |
| parent | ba5134c8e0e0f5bd9a22d5f02c1c75fc0cd33227 (diff) | |
| parent | 94df35da1fdfd9ded4c902e7be595df674fb1b72 (diff) | |
| download | nixlib-883ee4dd72594f51c5af20d4fe6be09ce83a7e85.tar nixlib-883ee4dd72594f51c5af20d4fe6be09ce83a7e85.tar.gz nixlib-883ee4dd72594f51c5af20d4fe6be09ce83a7e85.tar.bz2 nixlib-883ee4dd72594f51c5af20d4fe6be09ce83a7e85.tar.lz nixlib-883ee4dd72594f51c5af20d4fe6be09ce83a7e85.tar.xz nixlib-883ee4dd72594f51c5af20d4fe6be09ce83a7e85.tar.zst nixlib-883ee4dd72594f51c5af20d4fe6be09ce83a7e85.zip | |
Merge pull request #6994 from oxij/trivial-package-fixes
Trivial package fixes
| -rw-r--r-- | pkgs/misc/screensavers/xscreensaver/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/emacs-packages.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
3 files changed, 6 insertions, 4 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 = 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; }; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ed13c3e187ba..b1e7e2b3352b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6902,7 +6902,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 ]; |