Unverified Commit 165c1725 authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

Merge pull request #327090 from SFrijters/obconf-cleanup 

obconf: cleanup
parents abed455f aa9ffbf2

pkgs/tools/X11/obconf/default.nix→pkgs/by-name/ob/obconf/package.nix

+17 −16
Original line number Diff line number Diff line 
{ 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";

  };

}
 
})

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -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;















  };