Skip to content

qvim: fix stdenvAdapters issue, disable Darwin builds #1189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
7c6f434c merged 2 commits into from
Nov 8, 2013
Merged

qvim: fix stdenvAdapters issue, disable Darwin builds #1189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
139b10e
qvim: fix stdenvAdapters issue
sergei-mironov Nov 8, 2013
2b1b4f3
qvim: chage platforms from 'unix' to 'linux'
sergei-mironov Nov 8, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions pkgs/applications/editors/vim/qvim.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}" ];
Expand Down Expand Up @@ -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;
};
})

2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8893,6 +8893,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 {};
Expand Down