Skip to content
Closed
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
43 changes: 43 additions & 0 deletions nixos/modules/services/x11/window-managers/fvwm.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
{ pkgs, config, ... }:

with pkgs.lib;

let
cfg = config.services.xserver.windowManager.fvwm;
in

{
options = {
services.xserver.windowManager.fvwm = {
enable = mkOption {
default = false;
example = true;
description = "Enable the fvwm window manager.";
};

configFile = mkOption {
default = null;
type = types.nullOr types.path;
description = ''
Path to the fvwm configuration file.
If left at the default value, $HOME/.fvwm/config will be used.
'';
};
};
};

config = mkIf cfg.enable {
services.xserver.windowManager = {
session = [{
name = "fvwm";
start = ''
${pkgs.fvwm}/bin/fvwm ${optionalString (cfg.configFile != null)
"-c \"${cfg.configFile}\""
} &
waitPID=$!
'';
}];
};
environment.systemPackages = [ pkgs.fvwm ];
};
}
21 changes: 21 additions & 0 deletions pkgs/applications/science/math/fricas/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{ stdenv, fetchurl, sbcl, libX11, libXpm, libICE, libSM, libXt, libXau, libXdmcp }:

stdenv.mkDerivation rec {
name = "fricas-1.2.2";

src = fetchurl {
url = "http://sourceforge.net/projects/fricas/files/fricas/1.2.2/${name}-full.tar.bz2";
sha256 = "87db64a1fd4211f3b776793acea931b4271d2e7a28396414c7d7397d833defe1";
};

buildInputs = [ sbcl libX11 libXpm libICE libSM libXt libXau libXdmcp ];

dontStrip = true;

meta = with stdenv.lib; {
description = "Fricas CAS";
homepage = http://fricas.sourceforge.net/;
license = "bsd";

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you chose license from stdenv.lib.licenses. please

platforms = platforms.all;

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i believe you only tested this on linux right?

};
}
11 changes: 11 additions & 0 deletions pkgs/applications/science/physics/root/cmake.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- cmake/modules/RootBuildOptions.cmake 1969-12-31 20:30:01.000000000 -0330
+++ cmake/modules/RootBuildOptions.cmake 2014-01-10 14:09:29.424937408 -0330
@@ -149,7 +149,7 @@

#---General Build options----------------------------------------------------------------------
# use, i.e. don't skip the full RPATH for the build tree
-set(CMAKE_SKIP_BUILD_RPATH FALSE)
+set(CMAKE_SKIP_BUILD_RPATH TRUE)
# when building, don't use the install RPATH already (but later on when installing)
set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
# add the automatically determined parts of the RPATH
24 changes: 24 additions & 0 deletions pkgs/applications/science/physics/root/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{ stdenv, fetchurl, cmake, mesa, libX11, gfortran, libXpm, libXft, libXext, zlib }:

stdenv.mkDerivation rec {
name = "root_v5.34.14";

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

version comes after dash ... above line should be name = "root-3.34.14";


src = fetchurl {
url = "ftp://root.cern.ch/root/${name}.source.tar.gz";
sha256 = "d5347ba1b614eb083cf08050b784d66a93c125ed89938708da1adb33323dee2b";
};

buildInputs = [ cmake gfortran mesa libX11 libXpm libXft libXext zlib ];

# CMAKE_INSTALL_RPATH_USE_LINK_PATH is set to FALSE in
# <rootsrc>/cmake/modules/RootBuildOptions.cmake.
# This patch sets it to TRUE.
patches = [ ./cmake.patch ];
patchFlags = "-p0";

meta = {
description = "A data analysis framework";
#maintainers = [ stdenv.lib.maintainers.urkud ];

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can also add yourself as a maintainer in lib/maintainers.nix file.

platforms = stdenv.lib.platforms.mesaPlatforms;
};

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

license is missing here.

}
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/pmount/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
version = "0.9.23";

src = fetchurl {
url = "mirror://debian/pool/main/p/pmount/pmount_${version}.orig.tar.bz2";
sha256 = "db38fc290b710e8e9e9d442da2fb627d41e13b3ee80326c15cc2595ba00ea036";
url = "https://launchpad.net/ubuntu/trusty/+source/pmount/0.9.23-2/+files/pmount_${version}.orig.tar.bz2";
sha256 = "0dm01sh5nnf2bk0jc0z87qxy2hbxcbxs4ba4kng8w3ki1clzqf6v";
};

buildInputs = [ intltool utillinux ];
Expand Down