From a166bc33cc5f545f9ac098d974ad22e98d721c11 Mon Sep 17 00:00:00 2001 From: George Whewell Date: Thu, 6 Dec 2018 15:58:27 +0000 Subject: [PATCH 1/4] cool-retro-term: add symlink to binary on darwin --- pkgs/applications/misc/cool-retro-term/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/misc/cool-retro-term/default.nix index c9cc2d6db42..deacdf4c11e 100644 --- a/pkgs/applications/misc/cool-retro-term/default.nix +++ b/pkgs/applications/misc/cool-retro-term/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { mv $out/usr/share $out/share mv $out/usr/bin $out/bin 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; @@ -38,7 +40,7 @@ stdenv.mkDerivation rec { ''; homepage = https://github.com/Swordfish90/cool-retro-term; license = with stdenv.lib.licenses; [ gpl2 gpl3 ]; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; maintainers = with stdenv.lib.maintainers; [ skeidel ]; }; } From b2cbbb32ac94bc1ca44c510f1cd044325e0f92a5 Mon Sep 17 00:00:00 2001 From: George Whewell Date: Thu, 6 Dec 2018 15:59:25 +0000 Subject: [PATCH 2/4] qmltermwidget: update to latest master to fix cool-retro-term on darwin --- pkgs/development/libraries/qmltermwidget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index 26386e0c42c..d73211fc486 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -7,8 +7,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { repo = "qmltermwidget"; owner = "Swordfish90"; - rev = "v${version}"; - sha256 = "0ca500mzcqglkj0i6km0z512y3a025dbm24605xyv18l6y0l2ny3"; + rev = "48274c75660e28d44af7c195e79accdf1bd44963"; + sha256 = "028nb1xp84jmakif5mmzx52q3rsjwckw27jdpahyaqw7j7i5znq6"; }; buildInputs = [ qtbase qtquick1 qtmultimedia ] From 7f82302b8ee76085e6270e5f6ccb9783cb90752a Mon Sep 17 00:00:00 2001 From: George Whewell Date: Wed, 12 Dec 2018 09:55:06 +0000 Subject: [PATCH 3/4] address pr comments --- pkgs/applications/misc/cool-retro-term/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/misc/cool-retro-term/default.nix index deacdf4c11e..1c2045f4141 100644 --- a/pkgs/applications/misc/cool-retro-term/default.nix +++ b/pkgs/applications/misc/cool-retro-term/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, qtbase, qtquick1, qmltermwidget, -qtquickcontrols, qtgraphicaleffects, qmake }: +{ stdenv, fetchFromGitHub, qtbase, qtquick1, qmltermwidget +, qtquickcontrols, qtgraphicaleffects, qmake }: stdenv.mkDerivation rec { version = "1.0.1"; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { eye-candy, customizable, and reasonably lightweight. ''; homepage = https://github.com/Swordfish90/cool-retro-term; - license = with stdenv.lib.licenses; [ gpl2 gpl3 ]; + license = stdenv.lib.licenses.gpl3Plus; platforms = with stdenv.lib.platforms; linux ++ darwin; maintainers = with stdenv.lib.maintainers; [ skeidel ]; }; From 7875e817cf9a28f83f80d3a8c3b2164e969efde4 Mon Sep 17 00:00:00 2001 From: George Whewell Date: Wed, 12 Dec 2018 16:32:28 +0000 Subject: [PATCH 4/4] change qmltermwidget version to 2018-11-24 and add unstable to name --- pkgs/development/libraries/qmltermwidget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index d73211fc486..ba62324d586 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, qtbase, qtquick1, qmake, qtmultimedia, utmp }: stdenv.mkDerivation rec { - version = "0.1.0"; - name = "qmltermwidget-${version}"; + version = "2018-11-24"; + name = "qmltermwidget-unstable-${version}"; src = fetchFromGitHub { repo = "qmltermwidget";