Merge pull request #102085 from luc65r/pkg/unicorn

unicorn(-emu): 1.0.2-rc4 -> 1.0.2

pkgs/development/libraries/unicorn-emu/default.nix

@@ -1,34 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, python, cmocka, hexdump, writeScriptBin, binutils-unwrapped }:
-
-stdenv.mkDerivation rec {
-  pname = "unicorn-emulator";
-  version = "1.0.2-rc4";
-
-  src = fetchurl {
-    url    = "https://github.com/unicorn-engine/unicorn/archive/${version}.tar.gz";
-    sha256 = "05w43jq3r97l3c8ggc745ai8m5l93p1b6q6cfp1zwzz6hl5kifiv";
-  };
-
-  PREFIX = placeholder "out";
-  MACOS_UNIVERSAL = stdenv.lib.optionalString stdenv.isDarwin "no";
-  NIX_CFLAGS_COMPILE = "-Wno-error";
-
-  doCheck = !stdenv.isDarwin;
-
-  checkInputs = [
-    cmocka
-    hexdump
-    python.pkgs.setuptools
-  ];
-
-  nativeBuildInputs = [ pkgconfig python ];
-  enableParallelBuilding = true;
-
-  meta = {
-    description = "Lightweight multi-platform CPU emulator library";
-    homepage    = "http://www.unicorn-engine.org";
-    license     = stdenv.lib.licenses.bsd3;
-    platforms   = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
-  };
-}

pkgs/development/libraries/unicorn/default.nix

@@ -0,0 +1,27 @@
+{ stdenv
+, fetchFromGitHub
+, pkgconfig
+, cmake
+}:
+
+stdenv.mkDerivation rec {
+  pname = "unicorn";
+  version = "1.0.2";
+
+  src = fetchFromGitHub {
+    owner = "unicorn-engine";
+    repo = pname;
+    rev = version;
+    sha256 = "0jgnyaq6ykpbg5hrwc0p3pargmr9hpzqfsj6ymp4k07pxnqal76j";
+  };
+
+  nativeBuildInputs = [ pkgconfig cmake ];
+
+  meta = with stdenv.lib; {
+    description = "Lightweight multi-platform CPU emulator library";
+    homepage = "http://www.unicorn-engine.org";
+    license = licenses.gpl2Only;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ thoughtpolice luc65r ];
+  };
+}

pkgs/development/python-modules/unicorn/default.nix

@@ -5,7 +5,7 @@ buildPythonPackage rec {
   version = stdenv.lib.getVersion unicorn-emu;
 
   src = unicorn-emu.src;
-  sourceRoot = "unicorn-${version}/bindings/python";
+  sourceRoot = "source/bindings/python";
 
   prePatch = ''
     ln -s ${unicorn-emu}/lib/libunicorn${stdenv.targetPlatform.extensions.sharedLibrary} prebuilt/

pkgs/top-level/aliases.nix

@@ -627,6 +627,7 @@ mapAliases ({
   ubootBeagleboneBlack = ubootAmx335xEVM; # added 2020-01-21
   ucsFonts = ucs-fonts; # added 2016-07-15
   ultrastardx-beta = ultrastardx; # added 2017-08-12
+  unicorn-emu = unicorn; # added 2020-10-29
   usb_modeswitch = usb-modeswitch; # added 2016-05-10
   usbguard-nox = usbguard; # added 2019-09-04
   uzbl = throw "uzbl has been removed from nixpkgs, as it's unmaintained and uses insecure libraries";

pkgs/top-level/all-packages.nix

@@ -1653,7 +1653,6 @@ in
   candle = libsForQt5.callPackage ../applications/misc/candle { };
 
   capstone = callPackage ../development/libraries/capstone { };
-  unicorn-emu = callPackage ../development/libraries/unicorn-emu { };
 
   casync = callPackage ../applications/networking/sync/casync {
     sphinx = python3Packages.sphinx;
@@ -8079,6 +8078,8 @@ in
 
   unbound = callPackage ../tools/networking/unbound { };
 
+  unicorn = callPackage ../development/libraries/unicorn { };
+
   units = callPackage ../tools/misc/units {
     enableCurrenciesUpdater = true;
     pythonPackages = python3Packages;

pkgs/top-level/python-packages.nix

@@ -7375,7 +7375,9 @@ in {
 
   unicode-slugify = callPackage ../development/python-modules/unicode-slugify { };
 
-  unicorn = callPackage ../development/python-modules/unicorn { };
+  unicorn = callPackage ../development/python-modules/unicorn {
+    unicorn-emu = pkgs.unicorn;
+  };
 
   unidecode = callPackage ../development/python-modules/unidecode { };