mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 08:23:09 +00:00
Merge pull request #1189 from grwlf/qvim
qvim: fix stdenvAdapters issue, disable Darwin builds
This commit is contained in:
commit
d569958894
@ -19,7 +19,8 @@ composableDerivation {
|
||||
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); "";
|
||||
|
||||
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)";
|
||||
homepage = https://bitbucket.org/equalsraf/vim-qt/wiki/Home;
|
||||
maintainers = with maintainers; [ smironov ];
|
||||
platforms = platforms.unix;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
})
|
||||
|
||||
|
@ -8876,6 +8876,8 @@ let
|
||||
features = "huge"; # one of tiny, small, normal, big or huge
|
||||
lua = pkgs.lua5;
|
||||
flags = [ "python" "X11" ]; # only flag "X11" by now
|
||||
|
||||
inherit stdenvAdapters gccApple;
|
||||
});
|
||||
|
||||
virtviewer = callPackage ../applications/virtualization/virt-viewer {};
|
||||
|
Loading…
Reference in New Issue
Block a user