diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/caelum/default.nix | 22 | ||||
-rw-r--r-- | pkgs/development/libraries/mygui/svn.nix | 27 | ||||
-rw-r--r-- | pkgs/games/rigsofrods/default.nix | 60 | ||||
-rw-r--r-- | pkgs/games/rigsofrods/doubleslash.patch | 13 | ||||
-rw-r--r-- | pkgs/games/rigsofrods/paths.patch | 12 | ||||
-rw-r--r-- | pkgs/tools/backup/borg/default.nix | 7 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
7 files changed, 3 insertions, 146 deletions
diff --git a/pkgs/development/libraries/caelum/default.nix b/pkgs/development/libraries/caelum/default.nix deleted file mode 100644 index 823eac145485..000000000000 --- a/pkgs/development/libraries/caelum/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, cmake, pkgconfig, ois, ogre, boost }: - -stdenv.mkDerivation rec { - name = "caelum-0.6.1"; - - src = fetchurl { - url = "http://caelum.googlecode.com/files/${name}.tar.gz"; - sha256 = "1j995q1a88cikqrxdqsrwzm2asid51xbmkl7vn1grfrdadb15303"; - }; - - buildInputs = [ ois ogre boost ]; - nativeBuildInputs = [ cmake pkgconfig ]; - - enableParallelBuilding = true; - - meta = { - description = "Add-on for the OGRE, aimed to render atmospheric effects"; - homepage = http://code.google.com/p/caelum/; - license = stdenv.lib.licenses.lgpl21Plus; - broken = true; - }; -} diff --git a/pkgs/development/libraries/mygui/svn.nix b/pkgs/development/libraries/mygui/svn.nix deleted file mode 100644 index 15da5054291e..000000000000 --- a/pkgs/development/libraries/mygui/svn.nix +++ /dev/null @@ -1,27 +0,0 @@ -{stdenv, fetchsvn, unzip, ogre, cmake, ois, freetype, libuuid, boost}: - -stdenv.mkDerivation rec { - name = "mygui-svn-4141"; - - src = fetchsvn { - url = https://my-gui.svn.sourceforge.net/svnroot/my-gui/trunk; - rev = 4141; - sha256 = "0xfm4b16ksqd1cwq45kl01wi4pmj244dpn11xln8ns7wz0sffjwn"; - }; - - enableParallelBuilding = true; - - cmakeFlags = [ - "-DOGRE_LIB_DIR=${ogre}/lib" - "-DOGRE_INCLUDE_DIR=${ogre}/include/OGRE" - "-DOGRE_LIBRARIES=OgreMain" - ]; - - buildInputs = [ unzip ogre cmake ois freetype libuuid boost ]; - - meta = { - homepage = http://mygui.info/; - description = "Library for creating GUIs for games and 3D applications"; - license = stdenv.lib.licenses.lgpl3Plus; - }; -} diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix deleted file mode 100644 index 26c7e0a36677..000000000000 --- a/pkgs/games/rigsofrods/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ fetchsvn, fetchurl, stdenv, wxGTK29, freeimage, cmake, zziplib, mesa, boost, - pkgconfig, libuuid, openal, ogre, ois, curl, gtk, pixman, mygui, unzip, - angelscript, caelum, ogrepaged, mysocketw, libxcb - }: - -stdenv.mkDerivation rec { - version = "0.39.4"; - name = "rigsofrods-${version}"; - - src = fetchurl { - url = mirror://sourceforge/rigsofrods/rigsofrods-source-0.39.4.tar.bz2; - sha256 = "1kpjkski0yllwzdki0rjpqvifjs0fwpgs513y4dv4s9wfwan1qcx"; - }; - - contentPackSrc = fetchurl { - url = mirror://sourceforge/rigsofrods/rigsofrods/0.37/content-pack-0.37.zip; - sha256 = "0prvn8lxqazadad4mv0nilax9i4vqb9s7dp7mqzvqc0ycmcnf4ps"; - }; - - enableParallelBuilding = true; - - cmakeFlags = [ - "-DROR_USE_CURL=TRUE" - "-DROR_USE_MYGUI=TRUE" - "-DROR_USE_OPNEAL=TRUE" - "-DROR_USE_CAELUM=TRUE" - "-DROR_USE_PAGED=TRUE" - "-DROR_USE_ANGELSCRIPT=TRUE" - "-DROR_USE_SOCKETW=TRUE" - "-DCMAKE_BUILD_TYPE=Release" - ]; - - installPhase = '' - sed -e "s@/usr/local/lib/OGRE@${ogre}/lib/OGRE@" -i ../tools/linux/binaries/plugins.cfg - mkdir -p $out/share/rigsofrods - cp -r ../bin/* $out/share/rigsofrods - cp ../tools/linux/binaries/plugins.cfg $out/share/rigsofrods - mkdir -p $out/bin - ln -s $out/share/rigsofrods/{RoR,rorconfig} $out/bin - cd $out/share/rigsofrods - mkdir packs - cd packs - unzip "${contentPackSrc}" - ''; - - patches = [ ./doubleslash.patch ./paths.patch ]; - - buildInputs = [ wxGTK29 freeimage cmake zziplib mesa boost pkgconfig - libuuid openal ogre ois curl gtk mygui unzip angelscript - caelum ogrepaged mysocketw libxcb ]; - - meta = { - description = "3D simulator game where you can drive, fly and sail various vehicles"; - homepage = http://rigsofrods.sourceforge.net/; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [viric raskin]; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/games/rigsofrods/doubleslash.patch b/pkgs/games/rigsofrods/doubleslash.patch deleted file mode 100644 index c62c5470dfc7..000000000000 --- a/pkgs/games/rigsofrods/doubleslash.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeDependenciesConfig.txt b/CMakeDependenciesConfig.txt -index 447a440..e2562de 100644 ---- a/CMakeDependenciesConfig.txt -+++ b/CMakeDependenciesConfig.txt -@@ -228,7 +228,7 @@ ELSEIF(UNIX) - # Paged Geometry - find_path(PAGED_INCLUDE_DIRS "PagedGeometry/PagedGeometry.h") - if(PAGED_INCLUDE_DIRS) -- set(PAGED_INCLUDE_DIRS "${PAGED_INCLUDE_DIRS};/${PAGED_INCLUDE_DIRS}/PagedGeometry") -+ set(PAGED_INCLUDE_DIRS "${PAGED_INCLUDE_DIRS};${PAGED_INCLUDE_DIRS}/PagedGeometry") - find_library(PAGED_LIBRARIES "PagedGeometry") - set(ROR_USE_PAGED ON) - else() diff --git a/pkgs/games/rigsofrods/paths.patch b/pkgs/games/rigsofrods/paths.patch deleted file mode 100644 index e20b00a76935..000000000000 --- a/pkgs/games/rigsofrods/paths.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/source/main/framework/ContentManager.cpp b/source/main/framework/ContentManager.cpp -index 0bfea8c..82cdab9 100644 ---- a/source/main/framework/ContentManager.cpp -+++ b/source/main/framework/ContentManager.cpp -@@ -238,6 +238,7 @@ bool ContentManager::init(void) - #endif // USE_OPENAL - - // and the content -+ ResourceGroupManager::getSingleton().addResourceLocation(SSETTING("Program Path")+"packs", "FileSystem", "Packs", true); - ResourceGroupManager::getSingleton().addResourceLocation(SSETTING("User Path")+"packs", "FileSystem", "Packs", true); - ResourceGroupManager::getSingleton().addResourceLocation(SSETTING("User Path")+"mods", "FileSystem", "Packs", true); - diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index df3523322e86..a68a5a7313e5 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -2,12 +2,12 @@ python3Packages.buildPythonPackage rec { name = "borgbackup-${version}"; - version = "0.27.0"; + version = "0.29.0"; namePrefix = ""; src = fetchurl { url = "https://pypi.python.org/packages/source/b/borgbackup/borgbackup-${version}.tar.gz"; - sha256 = "04iizidag4fwy6kx1747d633s1amr81slgk743qsfbwixaxfjq9b"; + sha256 = "1gvx036a7j16hd5rg8cr3ibiig7gwqhmddrilsakcw4wnfimjy5m"; }; propagatedBuildInputs = with python3Packages; @@ -16,8 +16,6 @@ python3Packages.buildPythonPackage rec { preConfigure = '' export BORG_OPENSSL_PREFIX="${openssl}" export BORG_LZ4_PREFIX="${lz4}" - # note: fix for this issue already upstream and probably in 0.27.1 (or whatever the next release is called) - substituteInPlace setup.py --replace "possible_openssl_prefixes.insert(0, os.environ.get('BORG_LZ4_PREFIX'))" "possible_lz4_prefixes.insert(0, os.environ.get('BORG_LZ4_PREFIX'))" ''; meta = with stdenv.lib; { @@ -25,5 +23,6 @@ python3Packages.buildPythonPackage rec { homepage = https://borgbackup.github.io/; license = licenses.bsd3; platforms = platforms.unix; # Darwin and FreeBSD mentioned on homepage + maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3d7c9be3688..b9abcd7fec4d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6172,8 +6172,6 @@ let fetchurl = fetchurlBoot; }; - caelum = callPackage ../development/libraries/caelum { }; - capnproto = callPackage ../development/libraries/capnproto { }; ccnx = callPackage ../development/libraries/ccnx { }; @@ -7887,8 +7885,6 @@ let mygui = callPackage ../development/libraries/mygui {}; - myguiSvn = callPackage ../development/libraries/mygui/svn.nix {}; - mysocketw = callPackage ../development/libraries/mysocketw { }; mythes = callPackage ../development/libraries/mythes { }; @@ -14251,10 +14247,6 @@ let openglSupport = mesaSupported; }; - rigsofrods = callPackage ../games/rigsofrods { - mygui = myguiSvn; - }; - rili = callPackage ../games/rili { }; rogue = callPackage ../games/rogue { }; |