diff --git a/pkgs/tools/X11/obconf/default.nix b/pkgs/by-name/ob/obconf/package.nix similarity index 68% rename from pkgs/tools/X11/obconf/default.nix rename to pkgs/by-name/ob/obconf/package.nix index 02fe2663b002..9b233017b4ea 100644 --- a/pkgs/tools/X11/obconf/default.nix +++ b/pkgs/by-name/ob/obconf/package.nix @@ -1,25 +1,26 @@ -{ lib -, stdenv -, fetchgit -, autoreconfHook -, pkg-config -, wrapGAppsHook3 -, gtk3 -, imlib2 -, libSM -, libstartup_notification -, libxml2 -, openbox +{ + lib, + stdenv, + fetchgit, + autoreconfHook, + pkg-config, + wrapGAppsHook3, + gtk3, + imlib2, + libSM, + libstartup_notification, + libxml2, + openbox, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "obconf"; version = "unstable-2015-02-13"; src = fetchgit { url = "git://git.openbox.org/dana/obconf"; rev = "63ec47c5e295ad4f09d1df6d92afb7e10c3fec39"; - sha256 = "sha256-qwm66VA/ueRMFtSUcrmuObNkz+KYgWRnmR7TnQwpxiE="; + hash = "sha256-qwm66VA/ueRMFtSUcrmuObNkz+KYgWRnmR7TnQwpxiE="; }; nativeBuildInputs = [ @@ -38,7 +39,7 @@ stdenv.mkDerivation rec { ]; postPatch = '' - substituteInPlace configure.ac --replace 2.0.4 ${version} + substituteInPlace configure.ac --replace 2.0.4 ${finalAttrs.version} ''; meta = { @@ -50,4 +51,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "obconf"; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 384d75d0214a..bc3b24d45590 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33021,8 +33021,6 @@ with pkgs; nvpy = callPackage ../applications/editors/nvpy { }; - obconf = callPackage ../tools/X11/obconf { }; - gnome-obfuscate = callPackage ../applications/graphics/gnome-obfuscate { inherit (darwin.apple_sdk.frameworks) Foundation; };