summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--pkgs/development/libraries/libui/default.nix85
-rw-r--r--pkgs/top-level/all-packages.nix5
2 files changed, 46 insertions, 44 deletions
diff --git a/pkgs/development/libraries/libui/default.nix b/pkgs/development/libraries/libui/default.nix
index 150e299ac42..dcc406accbd 100644
--- a/pkgs/development/libraries/libui/default.nix
+++ b/pkgs/development/libraries/libui/default.nix
@@ -1,54 +1,53 @@
-{ stdenv, fetchgit, cmake, pkgconfig, gtk3, darwin }:
+{ stdenv, fetchgit, cmake, pkgconfig, gtk3, cf-private, Cocoa }:
 
 let
   shortName = "libui";
   version   = "3.1a";
   backend   = if stdenv.isDarwin then "darwin" else "unix";
 in
-  stdenv.mkDerivation rec {
-    name = "${shortName}-${version}";
-    src  = fetchgit {
-      url    = "https://github.com/andlabs/libui.git";
-      rev    = "6ebdc96b93273c3cedf81159e7843025caa83058";
-      sha256 = "1lpbfa298c61aarlzgp7vghrmxg1274pzxh1j9isv8x758gk6mfn";
-    };
 
-    nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ cmake ] ++
-      (if backend == "darwin" then [darwin.apple_sdk.frameworks.Cocoa]
-       else if backend == "unix" then [gtk3]
-       else null);
+stdenv.mkDerivation rec {
+  name = "${shortName}-${version}";
+  src  = fetchgit {
+    url    = "https://github.com/andlabs/libui.git";
+    rev    = "6ebdc96b93273c3cedf81159e7843025caa83058";
+    sha256 = "1lpbfa298c61aarlzgp7vghrmxg1274pzxh1j9isv8x758gk6mfn";
+  };
 
-    preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
-      sed -i 's/set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8")//' ./CMakeLists.txt
-    '';
+  nativeBuildInputs = [ cmake pkgconfig ];
+  buildInputs = stdenv.lib.optional stdenv.isLinux gtk3
+    ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa cf-private /* For NSDefaultRunLoopMode */ ];
 
-    installPhase = ''
-      mkdir -p $out/{include,lib}
-      mkdir -p $out/lib/pkgconfig
-    '' + stdenv.lib.optionalString stdenv.isLinux ''
-      mv ./out/${shortName}.so.0 $out/lib/
-      ln -s $out/lib/${shortName}.so.0 $out/lib/${shortName}.so
-    '' + stdenv.lib.optionalString stdenv.isDarwin ''
-      mv ./out/${shortName}.A.dylib $out/lib/
-      ln -s $out/lib/${shortName}.A.dylib $out/lib/${shortName}.dylib
-    '' + ''
-      cp $src/ui.h $out/include
-      cp $src/ui_${backend}.h $out/include
+  preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
+    sed -i 's/set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8")//' ./CMakeLists.txt
+  '';
 
-      cp ${./libui.pc} $out/lib/pkgconfig/${shortName}.pc
-      substituteInPlace $out/lib/pkgconfig/${shortName}.pc \
-        --subst-var-by out $out \
-        --subst-var-by version "${version}"
-    '';
-    postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
-      install_name_tool -id $out/lib/${shortName}.A.dylib $out/lib/${shortName}.A.dylib
-    '';
+  installPhase = ''
+    mkdir -p $out/{include,lib}
+    mkdir -p $out/lib/pkgconfig
+  '' + stdenv.lib.optionalString stdenv.isLinux ''
+    mv ./out/${shortName}.so.0 $out/lib/
+    ln -s $out/lib/${shortName}.so.0 $out/lib/${shortName}.so
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    mv ./out/${shortName}.A.dylib $out/lib/
+    ln -s $out/lib/${shortName}.A.dylib $out/lib/${shortName}.dylib
+  '' + ''
+    cp $src/ui.h $out/include
+    cp $src/ui_${backend}.h $out/include
 
-    meta = with stdenv.lib; {
-      homepage    = https://github.com/andlabs/libui;
-      description = "Simple and portable (but not inflexible) GUI library in C that uses the native GUI technologies of each platform it supports.";
-      license     = licenses.mit;
-      platforms   = platforms.unix;
-    };
-  }
+    cp ${./libui.pc} $out/lib/pkgconfig/${shortName}.pc
+    substituteInPlace $out/lib/pkgconfig/${shortName}.pc \
+      --subst-var-by out $out \
+      --subst-var-by version "${version}"
+  '';
+  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+    install_name_tool -id $out/lib/${shortName}.A.dylib $out/lib/${shortName}.A.dylib
+  '';
+
+  meta = with stdenv.lib; {
+    homepage    = https://github.com/andlabs/libui;
+    description = "Simple and portable (but not inflexible) GUI library in C that uses the native GUI technologies of each platform it supports.";
+    license     = licenses.mit;
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 537a1b8cdcf..d9f87c4d6f5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11174,7 +11174,10 @@ with pkgs;
 
   libuecc = callPackage ../development/libraries/libuecc { };
 
-  libui = callPackage ../development/libraries/libui { };
+  libui = callPackage ../development/libraries/libui {
+    inherit (darwin) cf-private;
+    inherit (darwin.apple_sdk.frameworks) Cocoa;
+  };
 
   libunistring = callPackage ../development/libraries/libunistring { };