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

Merge pull request #51830 from georgewhewell/cool-retro-term-fix-darwin

Browse Source 
cool-retro-term: fix on darwin
This commit is contained in:
Jörg Thalheim 2018-12-12 17:53:23 +00:00 committed by GitHub
commit 007dfa8adc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/misc/cool-retro-term/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, qtbase, qtquick1, qmltermwidget, { stdenv, fetchFromGitHub, qtbase, qtquick1, qmltermwidget
qtquickcontrols, qtgraphicaleffects, qmake }: , qtquickcontrols, qtgraphicaleffects, qmake }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.0.1"; version = "1.0.1";
@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
mv $out/usr/share $out/share mv $out/usr/share $out/share
mv $out/usr/bin $out/bin mv $out/usr/bin $out/bin
rmdir $out/usr rmdir $out/usr
'' + stdenv.lib.optionalString stdenv.isDarwin ''
ln -s $out/bin/cool-retro-term.app/Contents/MacOS/cool-retro-term $out/bin/cool-retro-term
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;
@ -37,8 +39,8 @@ stdenv.mkDerivation rec {
eye-candy, customizable, and reasonably lightweight. eye-candy, customizable, and reasonably lightweight.
''; '';
homepage = https://github.com/Swordfish90/cool-retro-term; homepage = https://github.com/Swordfish90/cool-retro-term;
license = with stdenv.lib.licenses; [ gpl2 gpl3 ]; license = stdenv.lib.licenses.gpl3Plus;
platforms = stdenv.lib.platforms.linux; platforms = with stdenv.lib.platforms; linux ++ darwin;
maintainers = with stdenv.lib.maintainers; [ skeidel ]; maintainers = with stdenv.lib.maintainers; [ skeidel ];
}; };
} }

8
pkgs/development/libraries/qmltermwidget/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, qtbase, qtquick1, qmake, qtmultimedia, utmp }: { stdenv, fetchFromGitHub, qtbase, qtquick1, qmake, qtmultimedia, utmp }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.1.0"; version = "2018-11-24";
name = "qmltermwidget-${version}"; name = "qmltermwidget-unstable-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
repo = "qmltermwidget"; repo = "qmltermwidget";
owner = "Swordfish90"; owner = "Swordfish90";
rev = "v${version}"; rev = "48274c75660e28d44af7c195e79accdf1bd44963";
sha256 = "0ca500mzcqglkj0i6km0z512y3a025dbm24605xyv18l6y0l2ny3"; sha256 = "028nb1xp84jmakif5mmzx52q3rsjwckw27jdpahyaqw7j7i5znq6";
}; };
buildInputs = [ qtbase qtquick1 qtmultimedia ] buildInputs = [ qtbase qtquick1 qtmultimedia ]