public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #101042 from r-burns/soil 

soil: fix dead url, enable on darwin
This commit is contained in:
Michael Raskin 2020-11-07 12:13:22 +00:00 committed by GitHub
parent 434d9676aa 981c8bb5e2
commit d464bdce84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
pkgs/development/libraries/soil/default.nix
View File

@ -1,28 +1,45 @@
{ stdenv, fetchurl, unzip, mesa, libX11, libGL }: { stdenv, lib
, Carbon
, fetchzip
, libGL
, libX11
}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "soil"; name = "soil";
src = fetchurl { src = fetchzip {
url = "http://www.lonesock.net/files/soil.zip"; url = "https://web.archive.org/web/20200104042737id_/http://www.lonesock.net/files/soil.zip";
sha256 = "00gpwp9dldzhsdhksjvmbhsd2ialraqbv6v6dpikdmpncj6mnc52"; sha256 = "1c05nwbnfdgwaz8ywn7kg2xrcvrcbpdyhcfkkiiwk69zvil0pbgd";
}; };
buildInputs = [ unzip mesa libGL libX11 ]; buildInputs = if stdenv.hostPlatform.isDarwin then [
Carbon
] else [
libGL
libX11
];
sourceRoot = "Simple OpenGL Image Library/projects/makefile"; buildPhase = ''
preBuild = "mkdir obj"; cd src
preInstall = "mkdir -p $out/lib $out/include"; $CC $NIX_CFLAGS_COMPILE -c *.c
makeFlags = [ "LOCAL=$(out)" ]; $AR rcs libSOIL.a *.o
'';
installPhase = ''
mkdir -p $out/lib $out/include/SOIL
cp libSOIL.a $out/lib/
cp SOIL.h $out/include/SOIL/
'';
meta = { meta = with lib; {
description = "Simple OpenGL Image Library"; description = "Simple OpenGL Image Library";
longDescription = '' longDescription = ''
SOIL is a tiny C library used primarily for uploading textures SOIL is a tiny C library used primarily for uploading textures
into OpenGL. into OpenGL.
''; '';
homepage = "https://www.lonesock.net/soil.html"; homepage = "https://www.lonesock.net/soil.html";
license = stdenv.lib.licenses.publicDomain; license = licenses.publicDomain;
platforms = stdenv.lib.platforms.linux; platforms = platforms.unix;
maintainers = with maintainers; [ r-burns ];
}; };
} }

4
pkgs/top-level/all-packages.nix
View File

@ -15706,7 +15706,9 @@ in
sofia_sip = callPackage ../development/libraries/sofia-sip { }; sofia_sip = callPackage ../development/libraries/sofia-sip { };
soil = callPackage ../development/libraries/soil { }; soil = callPackage ../development/libraries/soil {
inherit (darwin.apple_sdk.frameworks) Carbon;
};
sonic = callPackage ../development/libraries/sonic { }; sonic = callPackage ../development/libraries/sonic { };