nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 16:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Address PR comments

Browse Source
This commit is contained in:
Roman Plášil 2020-02-26 20:44:13 +08:00 committed by Profpatsch
parent f47e6ff4ed
commit 3a3ccb106e
5 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/irrlicht/common.nix Normal file
View File

@ -0,0 +1,11 @@
{ fetchzip }:
rec {
pname = "irrlicht";
version = "1.8.4";
src = fetchzip {
url = "mirror://sourceforge/irrlicht/${pname}-${version}.zip";
sha256 = "02sq067fn4xpf0lcyb4vqxmm43qg2nxx770bgrl799yymqbvih5f";
};
}

12
pkgs/development/libraries/irrlicht/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchzip, libGLU, libGL, unzip, libXrandr, libX11, libXxf86vm }:
let
common = import ./common.nix { inherit fetchzip; };
in
stdenv.mkDerivation rec {
pname = "irrlicht";
version = "1.8.4";
pname = common.pname;
version = common.version;
src = fetchzip {
url = "mirror://sourceforge/irrlicht/${pname}-${version}.zip";
sha256 = "02sq067fn4xpf0lcyb4vqxmm43qg2nxx770bgrl799yymqbvih5f";
};
src = common.src;
preConfigure = ''
cd source/Irrlicht

13
pkgs/development/libraries/irrlicht/mac.nix
View File

@ -1,19 +1,12 @@
{ stdenv, fetchzip, libGLU, libGL, unzip, fetchFromGitHub, cmake, Cocoa, OpenGL, IOKit }:
let
version = "1.8.4";
irrlichtZip = fetchzip {
name = "irrlichtZip";
url = "mirror://sourceforge/irrlicht/irrlicht-${version}.zip";
sha256 = "02sq067fn4xpf0lcyb4vqxmm43qg2nxx770bgrl799yymqbvih5f";
};
common = import ./common.nix { inherit fetchzip; };
in
stdenv.mkDerivation rec {
pname = "irrlicht-mac";
inherit version;
version = common.version;
src = fetchFromGitHub {
owner = "quiark";
@ -23,7 +16,7 @@ stdenv.mkDerivation rec {
};
postUnpack = ''
cp -r ${irrlichtZip}/* $sourceRoot/
cp -r ${common.src}/* $sourceRoot/
chmod -R 777 $sourceRoot
'';

12
pkgs/development/libraries/leveldb/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub }:
{ stdenv, fetchFromGitHub, fixDarwinDylibNames }:
stdenv.mkDerivation rec {
pname = "leveldb";
@ -11,16 +11,14 @@ stdenv.mkDerivation rec {
sha256 = "01kxga1hv4wp94agx5vl3ybxfw5klqrdsrb6p6ywvnjmjxm8322y";
};
nativeBuildInputs = []
++ stdenv.lib.optional stdenv.isDarwin [ fixDarwinDylibNames ];
buildPhase = ''
make all
'';
installPhase = (stdenv.lib.optionalString stdenv.isDarwin ''
for file in out-shared/*.dylib.*.*; do
install_name_tool -id $out/lib/$(basename $file) $file
done
'') + # XXX consider removing above after transition to cmake in the next release
"
installPhase = "
mkdir -p $out/{bin,lib,include}
cp -r include $out

2
pkgs/games/minetest/default.nix
View File

@ -40,8 +40,6 @@ let
"-DOpenGL_GL_PREFERENCE=GLVND"
];
patches = [ ./fix_wordsize_confusion.patch ];
NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3
nativeBuildInputs = [ cmake doxygen graphviz ];