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

Merge pull request #1189 from grwlf/qvim

Browse Source 
qvim: fix stdenvAdapters issue, disable Darwin builds
This commit is contained in:
Michael Raskin 2013-11-08 01:30:23 -08:00
commit d569958894
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/editors/vim/qvim.nix
View File

@ -19,7 +19,8 @@ composableDerivation {
sha256 = "1qa3xl1b9gqw66p71h53l7ibs4y3zfyj553jss70ybxaxchbhi5b"; sha256 = "1qa3xl1b9gqw66p71h53l7ibs4y3zfyj553jss70ybxaxchbhi5b";
}; };
# FIXME: adopt Darwin fixes from vim/default.nix # FIXME: adopt Darwin fixes from vim/default.nix, then chage meta.platforms.linux
# to meta.platforms.unix
preConfigure = assert (! stdenv.isDarwin); ""; preConfigure = assert (! stdenv.isDarwin); "";
configureFlags = [ "--with-vim-name=qvim" "--enable-gui=qt" "--with-features=${args.features}" ]; configureFlags = [ "--with-vim-name=qvim" "--enable-gui=qt" "--with-features=${args.features}" ];
@ -108,7 +109,7 @@ composableDerivation {
description = "The most popular clone of the VI editor (Qt GUI fork)"; description = "The most popular clone of the VI editor (Qt GUI fork)";
homepage = https://bitbucket.org/equalsraf/vim-qt/wiki/Home; homepage = https://bitbucket.org/equalsraf/vim-qt/wiki/Home;
maintainers = with maintainers; [ smironov ]; maintainers = with maintainers; [ smironov ];
platforms = platforms.unix; platforms = platforms.linux;
}; };
}) })

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

@ -8876,6 +8876,8 @@ let
features = "huge"; # one of tiny, small, normal, big or huge features = "huge"; # one of tiny, small, normal, big or huge
lua = pkgs.lua5; lua = pkgs.lua5;
flags = [ "python" "X11" ]; # only flag "X11" by now flags = [ "python" "X11" ]; # only flag "X11" by now
inherit stdenvAdapters gccApple;
}); });
virtviewer = callPackage ../applications/virtualization/virt-viewer {}; virtviewer = callPackage ../applications/virtualization/virt-viewer {};