diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/audio/musikcube/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/firefox/wrapper.nix | 3 | ||||
-rw-r--r-- | pkgs/development/compilers/rgbds/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/libff/default.nix | 6 | ||||
-rw-r--r-- | pkgs/games/tdm/default.nix | 105 | ||||
-rw-r--r-- | pkgs/tools/misc/direnv/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
8 files changed, 15 insertions, 114 deletions
diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/applications/audio/musikcube/default.nix index dc936083caee..10a3b3b87358 100644 --- a/pkgs/applications/audio/musikcube/default.nix +++ b/pkgs/applications/audio/musikcube/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "musikcube"; - version = "0.96.1"; + version = "0.96.2"; src = fetchFromGitHub { owner = "clangen"; repo = pname; rev = version; - sha256 = "0gpyr25q6g9b8f9hi6jx3p4ijl7xrrjc78vw1fyjd59a7690d7kr"; + sha256 = "1vvc8295yadprfqpmk9i43ghymgsqxsg8zfx3p5i86a8xrdhd9vn"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 7f0b826f905e..a9888c3c47be 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -1,5 +1,5 @@ { stdenv, lib, makeDesktopItem, makeWrapper, lndir, config -, replace, fetchurl, zip, unzip, jq +, replace, fetchurl, zip, unzip, jq, xdg_utils ## various stuff that can be plugged in , flashplayer, hal-flash @@ -251,6 +251,7 @@ let --suffix LD_LIBRARY_PATH ':' "$libs" \ --suffix-each GTK_PATH ':' "$gtk_modules" \ --suffix-each LD_PRELOAD ':' "$(cat $(filterExisting $(addSuffix /extra-ld-preload $plugins)))" \ + --prefix PATH ':' "${xdg_utils}/bin" \ --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" \ --suffix PATH ':' "$out${browser.execdir or "/bin"}" \ --set MOZ_APP_LAUNCHER "${browserName}${nameSuffix}" \ diff --git a/pkgs/development/compilers/rgbds/default.nix b/pkgs/development/compilers/rgbds/default.nix index 499a0a5f9369..4c8a4cfd4efa 100644 --- a/pkgs/development/compilers/rgbds/default.nix +++ b/pkgs/development/compilers/rgbds/default.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation rec { pname = "rgbds"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "rednex"; repo = "rgbds"; rev = "v${version}"; - sha256 = "05djzl3h18zg2z5p2a881wjbmgikzkhf67cgk00frhw4v05sq0lf"; + sha256 = "0lygj7jzjlq4w0mkiir7ycysrd1p1akyvzrppjcchja05mi8wy9p"; }; nativeBuildInputs = [ bison flex pkg-config libpng ]; installFlags = [ "PREFIX=\${out}" ]; diff --git a/pkgs/development/libraries/libff/default.nix b/pkgs/development/libraries/libff/default.nix index 8413d5be4410..874f45cae709 100644 --- a/pkgs/development/libraries/libff/default.nix +++ b/pkgs/development/libraries/libff/default.nix @@ -14,6 +14,12 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DWITH_PROCPS=Off" ]; + # CMake is hardcoded to always build static library which causes linker + # failure for Haskell applications depending on haskellPackages.hevm on macOS. + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace libff/CMakeLists.txt --replace "STATIC" "SHARED" + ''; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ boost gmp openssl ]; diff --git a/pkgs/games/tdm/default.nix b/pkgs/games/tdm/default.nix deleted file mode 100644 index 98b7ecdc4778..000000000000 --- a/pkgs/games/tdm/default.nix +++ /dev/null @@ -1,105 +0,0 @@ -{ stdenv, fetchurl, binutils-unwrapped, sconsPackages, gnum4, p7zip, glibc_multi, mesa -, xorg, libGLU, libGL, openal -, lib, makeWrapper, makeDesktopItem }: - -let - pname = "tdm"; - version = "2.08"; - - desktop = makeDesktopItem { - desktopName = pname; - name = pname; - exec = "@out@/bin/${pname}"; - icon = pname; - terminal = "false"; - comment = "The Dark Mod - stealth FPS inspired by the Thief series"; - type = "Application"; - categories = "Game;"; - genericName = pname; - fileValidation = false; - }; -in stdenv.mkDerivation { - name = "${pname}-${version}"; - src = fetchurl { - url = "https://www.thedarkmod.com/sources/thedarkmod.${version}.src.7z"; - sha256 = "0bmv07j6s6q3m7hnpx7cwrycjkbvlf0y9sg9migakni0jg9yz5ps"; - }; - nativeBuildInputs = [ - p7zip sconsPackages.scons_3_1_2 gnum4 makeWrapper - ]; - buildInputs = [ - glibc_multi mesa.dev xorg.libX11.dev openal - xorg.libXext.dev xorg.libXxf86vm.dev - libGL libGLU - ]; - unpackPhase = '' - 7z x $src - ''; - - # I'm pretty sure there's a better way to build 2 targets than a random hook - preBuild = '' - pushd tdm_update - scons BUILD=release TARGET_ARCH=x64 - install -Dm755 bin/tdm_update.linux64 $out/share/libexec/tdm_update.linux - popd - ''; - - # why oh why can it find ld but not strip? - postPatch = '' - sed -i 's!strip \$!${binutils-unwrapped}/bin/strip $!' SConstruct - # This adds math.h needed for math::floor - sed -i 's|#include "Util.h"|#include "Util.h"\n#include <math.h>|' tdm_update/ConsoleUpdater.cpp - ''; - - installPhase = '' - runHook preInstall - - install -Dm644 ${desktop}/share/applications/${pname}.desktop $out/share/applications/${pname}.desktop - substituteInPlace $out/share/applications/${pname}.desktop --subst-var out - install -Dm755 thedarkmod.x64 $out/share/libexec/tdm - - # The package doesn't install assets, these get installed by running tdm_update.linux - # Provide a script that runs tdm_update.linux on first launch - install -Dm755 <(cat <<'EOF' -#!/bin/sh -set -e -DIR="$HOME/.local/share/tdm" -mkdir -p "$DIR" -cd "$DIR" -exec "PKGDIR/share/libexec/tdm_update.linux" --noselfupdate -EOF - ) $out/bin/tdm_update - - install -Dm755 <(cat <<'EOF' -#!/bin/sh -set -e -DIR="$HOME/.local/share/tdm" -if [ ! -d "$DIR" ]; then - echo "Please run tdm_update to (re)download game data" -else - cd "$DIR" - exec "PKGDIR/share/libexec/tdm" -fi -EOF - ) $out/bin/tdm - sed -i "s!PKGDIR!$out!g" $out/bin/tdm_update - sed -i "s!PKGDIR!$out!g" $out/bin/tdm - - runHook postInstall - ''; - - postInstall = '' - wrapProgram $out/bin/tdm --suffix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL libGLU ]} - ''; - - enableParallelBuilding = true; - sconsFlags = [ "BUILD=release" "TARGET_ARCH=x64" ]; - NIX_CFLAGS_COMPILE = "-Wno-error=format-security"; - meta = with stdenv.lib; { - description = "The Dark Mod - stealth FPS inspired by the Thief series"; - homepage = "http://www.thedarkmod.com"; - license = licenses.gpl3; - maintainers = with maintainers; [ cizra ]; - platforms = with platforms; [ "x86_64-linux" ]; # tdm also supports x86, but I don't have a x86 install at hand to test. - }; -} diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index 050dcf2955f3..185b97d72732 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "direnv"; - version = "2.25.0"; + version = "2.25.1"; vendorSha256 = null; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "direnv"; repo = "direnv"; rev = "v${version}"; - sha256 = "00bvznswmz08s2jqpz5xxmkqggd06h6g8cwk242aaih6qajxfpsn"; + sha256 = "0bwr7zdzjm5p6bjyzafc2n57y83f0pv2bmj99rhi8f94hhfydlsf"; }; # we have no bash at the moment for windows diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b99ab6eb32dc..3d4ce4b45363 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -607,6 +607,7 @@ mapAliases ({ systool = sysfsutils; # added 2018-04-25 tahoelafs = tahoe-lafs; # added 2018-03-26 tangogps = foxtrotgps; # added 2020-01-26 + tdm = throw "tdm has been removed because nobody can figure out how to fix OpenAL integration. Use precompiled binary and `steam-run` instead."; telepathy_farstream = telepathy-farstream; # added 2018-02-25 telepathy_gabble = telepathy-gabble; # added 2018-02-25 telepathy_glib = telepathy-glib; # added 2018-02-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 063db5ad7586..0c7c2919ec3c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28802,8 +28802,6 @@ in gcc-armhf-embedded = pkgsCross.armhf-embedded.buildPackages.gcc; }; - tdm = callPackage ../games/tdm { }; - newlib = callPackage ../development/misc/newlib { }; newlibCross = callPackage ../development/misc/newlib { stdenv = crossLibcStdenv; |