diff options
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/science/misc/golly/default.nix | 18 | ||||
| -rw-r--r-- | pkgs/misc/emulators/retroarch/cores.nix | 2 | ||||
| -rw-r--r-- | pkgs/misc/screensavers/xlockmore/default.nix | 23 | ||||
| -rw-r--r-- | pkgs/misc/screensavers/xlockmore/makefile-libcrypt.patch | 11 |
4 files changed, 29 insertions, 25 deletions
diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/applications/science/misc/golly/default.nix index a29d37cc41a1..63a0be47c474 100644 --- a/pkgs/applications/science/misc/golly/default.nix +++ b/pkgs/applications/science/misc/golly/default.nix @@ -13,15 +13,27 @@ let wxGTK perl python zlib ]; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { inherit (s) name version; inherit buildInputs; src = fetchurl { inherit (s) url sha256; }; - preConfigure = '' - cd gui-wx/configure + + sourceRoot="${name}-src/gui-wx/configure"; + + # Link against Python explicitly as it is needed for scripts + makeFlags=[ + "AM_LDFLAGS=" + ]; + NIX_LDFLAGS="-lpython${python.majorVersion} -lperl"; + preConfigure='' + export NIX_LDFLAGS="$NIX_LDFLAGS -L$(dirname "$(find ${perl} -name libperl.so)")" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE + -DPYTHON_SHLIB=$(basename "$( + readlink -f ${python}/lib/libpython*.so)")" ''; + meta = { inherit (s) version; description = "Cellular automata simulation program"; diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 346e1cbf7715..5da82ab3452d 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -33,7 +33,7 @@ let inherit description; homepage = "http://www.libretro.com/"; license = licenses.gpl3Plus; - maintainers = [ maintainers.edwtjo ]; + maintainers = [ maintainers.edwtjo maintainers.MP2E ]; platforms = platforms.linux; }; } // a); diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix index 7e750d9c9b37..f06eab3a29a4 100644 --- a/pkgs/misc/screensavers/xlockmore/default.nix +++ b/pkgs/misc/screensavers/xlockmore/default.nix @@ -2,23 +2,20 @@ stdenv.mkDerivation rec { - name = "xlockmore-5.43"; + name = "xlockmore-5.44"; src = fetchurl { url = "http://www.tux.org/~bagleyd/xlock/${name}/${name}.tar.bz2"; - sha256 = "1l36n8x51j7lwdalv6yi37cil290vzd3djjqydhsm0pnm8hiz499"; + sha256 = "07bxl2k84jzz2zn364jakd1sg8rlhynkb7pchb19wy785ssgwvfi"; }; # Optionally, it can use GTK+. buildInputs = [ pam x11 ]; - # The `xlock' program needs to be linked against Glibc's - # `libgcrypt', which contains `crypt(3)'. - patches = [ ./makefile-libcrypt.patch ]; - # Don't try to install `xlock' setuid. Password authentication works # fine via PAM without super user privileges. configureFlags = - " --with-crypt" # TODO: set --enable-appdefaultdir to a suitable value + " --with-crypt" + + " --enable-appdefaultdir=$out/share/X11/app-defaults" + " --disable-setuid" + " --without-editres" + " --without-xpm" @@ -38,9 +35,15 @@ stdenv.mkDerivation rec { + " --without-gtk" + (if pam != null then " --enable-pam --enable-bad-pam" else " --disable-pam"); - meta = { + preConfigure = '' + configureFlags+=" --enable-appdefaultdir=$out/share/X11/app-defaults" + ''; + + meta = with stdenv.lib; { description = "Screen locker for the X Window System"; - homepage = "http://www.tux.org/~bagleyd/xlockmore.html"; - license = "GPL"; + homepage = http://www.tux.org/~bagleyd/xlockmore.html; + license = licenses.gpl2; + maintainers = with maintainers; [ pSub ]; + platforms = platforms.linux; }; } diff --git a/pkgs/misc/screensavers/xlockmore/makefile-libcrypt.patch b/pkgs/misc/screensavers/xlockmore/makefile-libcrypt.patch deleted file mode 100644 index df31a00a13b8..000000000000 --- a/pkgs/misc/screensavers/xlockmore/makefile-libcrypt.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xlockmore-5.24/modes/Makefile.in 2007-01-22 23:02:07.000000000 +0100 -+++ xlockmore-5.24/modes/Makefile.in 2008-02-11 17:24:34.000000000 +0100 -@@ -326,7 +326,7 @@ CFLAGS = @CFLAGS@ - CXXFLAGS = @CXXFLAGS@ - #CFLAGS = -O - #CFLAGS = -g --XLOCKLDFLAGS = @XLOCKLDFLAGS@ $(CHECKLDFLAG) -+XLOCKLDFLAGS = @XLOCKLDFLAGS@ $(CHECKLDFLAG) -lcrypt - XLIBS = @XLIBS@ - XLOCKLIBS = $(MODULELIB) @XLOCKLIBS@ - |