MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-20 01:16:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

openbrf: fix build

Browse source
This commit is contained in:
Jörg Thalheim 2017-05-13 09:38:19 +01:00
parent f016fa3ce3
commit 9237fdd1d0
No known key found for this signature in database
GPG key ID: CA4106B8D7CC79FA
2 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
pkgs/applications/misc/openbrf/default.nix
View file

@ -1,16 +1,18 @@
{ stdenv, fetchFromGitHub, qt4, qmake4Hook, vcg, glew }:
{ stdenv, fetchFromGitHub, qtbase, vcg, glew, qmakeHook, makeQtWrapper, mesa }:
stdenv.mkDerivation {
name = "openbrf-2016-01-09";
name = "openbrf-unstable-2016-01-09";
src = fetchFromGitHub {
owner = "cfcohen";
repo = "openbrf";
rev = "c18d7431e1d499cee11586f4a035fb5fdc0d3330";
sha256 = "0laikpz0ljz7l5fgapwj09ygizmvj1iywnpfgfd0i14j46s134xb";
rev = "4bdc66e38def5e5184f5379c84a7558b7484c70a";
sha256 = "16254cnr60ihcn7bki7wl1qm6gkvzb99cn66md1pnb7za8nvzf4j";
};
buildInputs = [ qt4 qmake4Hook vcg glew ];
buildInputs = [ qtbase vcg glew ];
nativeBuildInputs = [ qmakeHook makeQtWrapper ];
enableParallelBuilding = true;
@ -21,9 +23,19 @@ stdenv.mkDerivation {
'';
installPhase = ''
install -Dm755 openBrf $out/bin/openBrf
install -Dm755 openBrf $out/share/openBrf/openBrf
install -Dm644 carry_positions.txt $out/share/openBrf/carry_positions.txt
install -Dm644 reference.brf $out/share/openBrf/reference.brf
patchelf \
--set-rpath "${stdenv.lib.makeLibraryPath [ qtbase glew stdenv.cc.cc mesa ]}" \
$out/share/openBrf/openBrf
makeQtWrapper "$out/share/openBrf/openBrf" "$out/bin/openBrf"
'';
dontPatchELF = true;
meta = with stdenv.lib; {
description = "A tool to edit resource files (BRF)";
homepage = "https://github.com/cfcohen/openbrf";

2
pkgs/top-level/all-packages.nix
View file

@ -15134,7 +15134,7 @@ with pkgs;
openbox-menu = callPackage ../applications/misc/openbox-menu { };
openbrf = callPackage ../applications/misc/openbrf { };
openbrf = libsForQt5.callPackage ../applications/misc/openbrf { };
opencpn = callPackage ../applications/misc/opencpn { };