From e88150faaa3afc1b948300b9f2197b1fe7520439 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 11 Dec 2022 21:56:24 -0300 Subject: [PATCH] ftgl: incorporate darwin into its expression --- pkgs/development/libraries/ftgl/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/ftgl/default.nix b/pkgs/development/libraries/ftgl/default.nix index 46d6180eb1dc..b6554979c7ee 100644 --- a/pkgs/development/libraries/ftgl/default.nix +++ b/pkgs/development/libraries/ftgl/default.nix @@ -5,13 +5,15 @@ , doxygen , freeglut , freetype -, GLUT , libGL , libGLU -, OpenGL , pkg-config +, darwin }: +let + inherit (darwin.apple_sdk.frameworks) OpenGL GLUT; +in stdenv.mkDerivation rec { pname = "ftgl"; version = "2.4.0"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6af0f14cbd4e..5c660097a03a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7240,9 +7240,7 @@ with pkgs; frostwire = callPackage ../applications/networking/p2p/frostwire { }; frostwire-bin = callPackage ../applications/networking/p2p/frostwire/frostwire-bin.nix { }; - ftgl = callPackage ../development/libraries/ftgl { - inherit (darwin.apple_sdk.frameworks) OpenGL GLUT; - }; + ftgl = callPackage ../development/libraries/ftgl { }; ftop = callPackage ../os-specific/linux/ftop { };