public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6994 from oxij/trivial-package-fixes

Browse Source 
Trivial package fixes
This commit is contained in:
Domen Kožar 2015-03-27 11:09:16 +01:00
commit 883ee4dd72
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/misc/screensavers/xscreensaver/default.nix
View File

@ -18,14 +18,15 @@ stdenv.mkDerivation rec {
libXxf86misc intltool libXxf86misc intltool
]; ];
patchPhase = preConfigure =
'' ''
# Fix build error in version 5.18. Remove this patch when updating # Fix build error in version 5.18. Remove this patch when updating
# to a later version. # to a later version.
#sed -i -e '/AF_LINK/d' hacks/glx/sonar-icmp.c #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@%' \ 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 = configureFlags =

1
pkgs/top-level/emacs-packages.nix
View File

@ -454,6 +454,7 @@ let self = _self // overrides;
pname = "ghc"; pname = "ghc";
version = external.ghc-mod.version; version = external.ghc-mod.version;
src = external.ghc-mod.src; src = external.ghc-mod.src;
propagatedUserEnvPkgs = [ external.ghc-mod ];
fileSpecs = [ "elisp/*.el" ]; fileSpecs = [ "elisp/*.el" ];
meta = { license = bsd3; }; meta = { license = bsd3; };
}; };

2
pkgs/top-level/python-packages.nix
View File

@ -6902,7 +6902,7 @@ let
src = pkgs.notmuch.src; src = pkgs.notmuch.src;
sourceRoot = "${pkgs.notmuch.name}/bindings/python"; sourceRoot = "${pkgs.notmuch.src.name}/bindings/python";
buildInputs = with self; [ python pkgs.notmuch ]; buildInputs = with self; [ python pkgs.notmuch ];