diff options
| -rw-r--r-- | pkgs/applications/science/biology/arb/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/libraries/openmotif/default.nix | 32 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 37 insertions, 5 deletions
diff --git a/pkgs/applications/science/biology/arb/default.nix b/pkgs/applications/science/biology/arb/default.nix index d0feae803937..4a732e7750cc 100644 --- a/pkgs/applications/science/biology/arb/default.nix +++ b/pkgs/applications/science/biology/arb/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { patches = [ ./makefile.patch ]; - buildInputs = [ glew mesa libpng libXpm lesstif lynx freeglut libtiff rxp sablotron libXaw perl jdk transfig libX11 libXext libXt gv xfig gnuplot ]; + buildInputs = [ glew mesa libpng libXpm lesstif lynx freeglut libtiff rxp sablotron libXaw perl jdk transfig libX11 libXext libXt gv gnuplot ]; unpackPhase = '' tar xzf $src @@ -34,19 +34,19 @@ stdenv.mkDerivation { cp -vau lib/pts $shareddir/lib rm -vrf lib/pts ln -vs $shareddir/lib/pts $out/lib/pts - chmod a+rwx -R $shareddir/lib/pts + chmod a+rwx $shareddir/lib/pts # link out writable shared location lib/nas/ ensureDir $shareddir/lib/nas cp -vau lib/nas $shareddir/lib rm -vrf lib/nas ln -vs $shareddir/lib/nas $out/lib/nas - chmod a+rwx -R $shareddir/lib/nas + chmod a+rwx $shareddir/lib/nas # link out shared lib/pixmaps (not sure about this, yet): ensureDir $shareddir/lib/pixmaps cp -vau lib/pixmaps $shareddir/lib rm -vrf lib/pixmaps ln -vs $shareddir/lib/pixmaps $out/lib/pixmaps - chmod a+rwx -R $shareddir/lib/pixmaps + chmod a+rwx $shareddir/lib/pixmaps # bulk copy cp -vau * $out # replace arb script diff --git a/pkgs/development/libraries/openmotif/default.nix b/pkgs/development/libraries/openmotif/default.nix new file mode 100644 index 000000000000..cf9b059bd163 --- /dev/null +++ b/pkgs/development/libraries/openmotif/default.nix @@ -0,0 +1,32 @@ +args: with args; + +# this is the stable edition of OpenMotif - sources fetched from Debian, without +# patches applied + +stdenv.mkDerivation { + name = "openmotif-2.2.3"; + src = fetchurl { + url = http://ftp.de.debian.org/debian/pool/non-free/o/openmotif/openmotif_2.2.3.orig.tar.gz; + sha256 = "0amd9834p1ajnin7c8f1gad2jl2csf69msxcpc10rzm2x27jigxi"; + }; + + unpackPhase = '' + tar xzf $src + tar xzf openmotif-2.2.3.orig/dist/openMotif-2.2.3.tar.gz + rm -rf openmotif-2.2.3.orig + cd openMotif-2.2.3 + ''; + + buildInputs = [flex perl]; + propagatedBuildInputs = [x11 libXp libXau libXaw libXext xbitmaps]; + + CFLAGS="-fno-strict-aliasing"; # without this openmotif may segfault + + meta = { + description = "Open source version of motif toolkit including aka libmotif3"; + homepage = http://www.opengroup.org/openmotif/; + # Open motif is free for open source projects + license = "non-free"; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 16b6a9f1c737..93b71e8023a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7361,7 +7361,7 @@ let arb = import ../applications/science/biology/arb { inherit fetchurl stdenv readline libpng zlib x11 lesstif93 freeglut perl; inherit (xlibs) libXpm libXaw libX11 libXext libXt; - inherit mesa glew libtiff lynx rxp sablotron jdk xfig transfig gv gnuplot; + inherit mesa glew libtiff lynx rxp sablotron jdk transfig gv gnuplot; lesstif = lesstif93; }; |